service-model-approve updates

Change-Id: I9df7593533caa6e1613a3752ae59acd1df4ffe6b Issue-ID: CLI-166 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
author: Kanagaraj Manickam <mkr1481@gmail.com> 2019-08-29 16:43:18 +0530
committer: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> 2019-08-29 16:43:18 +0530
commit: aaa51ac88c0921840263b67a2cc1f5c17f8c09d5 (patch)
tree: 6058913e4c57e11576bc168a1fdaaa163d8aa51e /products
parent: a484da85eaa57c41cb26b929de3485750f10a08c (diff)
3 files changed, 582 insertions, 10159 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-moco.json
index a14aab76..c45524c9 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-moco.json
@@ -1,351 +1,377 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/sdc2/rest/v1/catalog/services/054425a1-5580-4758-ac33-ce817c8c7903/distribution-state/approve",
+    "uri" : "/sdc2/rest/v1/catalog/services/402a8ba7-5425-4072-8d05-40d7acbb4411/distribution-state/approve",
     "headers" : {
       "Authorization" : "Basic Z3YwMDAxOmRlbW8xMjM0NTYh",
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
       "USER_ID" : "gv0001",
-      "X-TransactionId" : "req-dda1fa86-4202-46e9-860d-55a7f23874cb",
+      "X-TransactionId" : "req-23320bcb-e746-43f9-aff1-8f714ec696d9",
       "Content-Type" : "application/json"
     },
     "json" : {
-      "userRemarks" : "approved cli"
+      "userRemarks" : "Created by Open Command Platform - OCOMP"
     }
   },
   "response" : {
     "status" : 200,
     "json" : {
       "artifacts" : {
-        "servicequestionnaire" : {
-          "creationDate" : 1553191779121,
+        "controlloopfunctions" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicequestionnaire",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Service Questionnaire",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.controlloopfunctions",
+          "artifactDisplayName" : "Control Loop Functions",
+          "artifactLabel" : "controlloopfunctions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicequestionnaire",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "dimensioninginfo" : {
-          "creationDate" : 1553191779121,
+        "operationalpolicies" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "dimensioninginfo",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Dimensioning Info",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.operationalpolicies",
+          "artifactDisplayName" : "Operational Policies",
+          "artifactLabel" : "operationalpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.dimensioninginfo",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "controlloopfunctions" : {
-          "creationDate" : 1553191779121,
+        "certificationtestresults" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "controlloopfunctions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Control Loop Functions",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.certificationtestresults",
+          "artifactDisplayName" : "TD Certification Test Results",
+          "artifactLabel" : "certificationtestresults",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.controlloopfunctions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "affinityrules" : {
-          "creationDate" : 1553191779121,
+        "deploymentvotingrecord" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "affinityrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Affinity Rules",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.deploymentvotingrecord",
+          "artifactDisplayName" : "Deployment Voting Record",
+          "artifactLabel" : "deploymentvotingrecord",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.affinityrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "operationalpolicies" : {
-          "creationDate" : 1553191779121,
+        "servicequestionnaire" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "operationalpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Operational Policies",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicequestionnaire",
+          "artifactDisplayName" : "Service Questionnaire",
+          "artifactLabel" : "servicequestionnaire",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.operationalpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "certificationtestresults" : {
-          "creationDate" : 1553191779121,
+        "toscacsar" : {
+          "creationDate" : 1567068779671,
+          "description" : "Created by Open Command Platform - OCOMP",
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "certificationtestresults",
-          "artifactVersion" : "0",
+          "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.toscacsar",
+          "artifactName" : "tosca-csar",
+          "artifactDisplayName" : "tosca csar",
+          "artifactLabel" : "toscacsar",
           "artifactGroupType" : "INFORMATIONAL",
+          "updaterFullName" : "Carlos Santana",
+          "userIdLastUpdater" : "cs0008",
+          "mandatory" : false,
+          "serviceApi" : false,
+          "artifactCreator" : "cs0008",
+          "generated" : false,
+          "isFromCsar" : false,
+          "payloadUpdateDate" : 1567068780186,
+          "lastUpdateDate" : 1567068779671,
+          "artifactUUID" : "5bc1a821-7c50-4b92-8d21-8ad44c1713fb",
+          "artifactVersion" : "1",
+          "artifactChecksum" : "YTVhYjY0OTYyMzMzMTM0ODI4ZmE2MGE4MWZiNjhlZmY=",
+          "esId" : "58620731-40a9-4f8e-95db-ef9fc478a705.toscacsar",
+          "duplicated" : false,
+          "empty" : false
+        },
+        "dimensioninginfo" : {
+          "creationDate" : 1567068764424,
+          "timeout" : 0,
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "TD Certification Test Results",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.dimensioninginfo",
+          "artifactDisplayName" : "Dimensioning Info",
+          "artifactLabel" : "dimensioninginfo",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.certificationtestresults",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
-        "deploymentvotingrecord" : {
-          "creationDate" : 1553191779121,
+        "affinityrules" : {
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "deploymentvotingrecord",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
-          "artifactDisplayName" : "Deployment Voting Record",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.affinityrules",
+          "artifactDisplayName" : "Affinity Rules",
+          "artifactLabel" : "affinityrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.deploymentvotingrecord",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "serviceartifactplan" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "serviceartifactplan",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.serviceartifactplan",
           "artifactDisplayName" : "Service Artifact Plan",
+          "artifactLabel" : "serviceartifactplan",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.serviceartifactplan",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicespecificpolicies" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicespecificpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicespecificpolicies",
           "artifactDisplayName" : "Service-specific Policies",
+          "artifactLabel" : "servicespecificpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicespecificpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicesecuritytemplate" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicesecuritytemplate",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicesecuritytemplate",
           "artifactDisplayName" : "Service Security Template",
+          "artifactLabel" : "servicesecuritytemplate",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicesecuritytemplate",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "engineeringrules" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "engineeringrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.engineeringrules",
           "artifactDisplayName" : "Engineering Rules (ERD)",
+          "artifactLabel" : "engineeringrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.engineeringrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "distributioninstructions" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "distributioninstructions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.distributioninstructions",
           "artifactDisplayName" : "Distribution Instructions",
+          "artifactLabel" : "distributioninstructions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.distributioninstructions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "summaryofimpactstoecompelements" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "summaryofimpactstoecompelements",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.summaryofimpactstoecompelements",
           "artifactDisplayName" : "Summary of impacts to ECOMP elements,OSSs, BSSs",
+          "artifactLabel" : "summaryofimpactstoecompelements",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.summaryofimpactstoecompelements",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
       "deploymentArtifacts" : { },
       "toscaArtifacts" : {
         "assettoscacsar" : {
-          "creationDate" : 1553191779121,
-          "timeout" : 0,
+          "creationDate" : 1567068764424,
           "description" : "TOSCA definition package of the asset",
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "assettoscacsar",
-          "artifactUUID" : "4cee7eee-650e-468c-92e7-c1113ef25a22",
-          "artifactVersion" : "1",
-          "artifactGroupType" : "TOSCA",
-          "artifactName" : "service-CliServiceMod-csar.csar",
+          "timeout" : 0,
           "artifactType" : "TOSCA_CSAR",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscacsar",
+          "artifactName" : "service-VgwocompvtpService-csar.csar",
           "artifactDisplayName" : "Tosca Model",
+          "artifactLabel" : "assettoscacsar",
+          "artifactGroupType" : "TOSCA",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.assettoscacsar",
-          "artifactChecksum" : "NjJjOGE5Zjc5OTliZWQyMjFlZWRiNjdlNGVmOWY4NGY=",
           "serviceApi" : false,
-          "payloadUpdateDate" : 1553192489130,
-          "esId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.assettoscacsar",
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "payloadUpdateDate" : 1567068797730,
+          "lastUpdateDate" : 1567068764424,
+          "artifactUUID" : "fee28e3f-82d2-4202-ad24-935880cac43c",
+          "artifactVersion" : "1",
+          "artifactChecksum" : "OTk3ZTM4ZjkxMWM0NDM1N2Y2ZTVjMTM1MDkwMzUxM2Y=",
+          "esId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscacsar",
+          "duplicated" : false,
           "empty" : false
         },
         "assettoscatemplate" : {
-          "creationDate" : 1553191779121,
-          "timeout" : 0,
+          "creationDate" : 1567068764424,
           "description" : "TOSCA representation of the asset",
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "assettoscatemplate",
-          "artifactUUID" : "d1368c62-3c36-469b-bde1-980ae4d8ae89",
-          "artifactVersion" : "1",
-          "artifactGroupType" : "TOSCA",
-          "artifactName" : "service-CliServiceMod-template.yml",
+          "timeout" : 0,
           "artifactType" : "TOSCA_TEMPLATE",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscatemplate",
+          "artifactName" : "service-VgwocompvtpService-template.yml",
           "artifactDisplayName" : "Tosca Template",
+          "artifactLabel" : "assettoscatemplate",
+          "artifactGroupType" : "TOSCA",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.assettoscatemplate",
-          "artifactChecksum" : "Njk5NzI2YjhkODM4MTM3ZWZmM2RhZmE4NDhmNGRiYjg=",
           "serviceApi" : false,
-          "payloadUpdateDate" : 1553192487714,
-          "esId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.assettoscatemplate",
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "payloadUpdateDate" : 1567068797397,
+          "lastUpdateDate" : 1567068764424,
+          "artifactUUID" : "1995e586-cc04-4c21-9256-5e6b5f20499e",
+          "artifactVersion" : "1",
+          "artifactChecksum" : "MDkyMjg4YmZiMDM2ZjMyOTBkN2M5NGYyMTgyOTAyYWE=",
+          "esId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscatemplate",
+          "duplicated" : false,
           "empty" : false
         }
       },
@@ -356,5427 +382,77 @@
         "empty" : false
       } ],
       "componentInstances" : [ {
-        "capabilities" : {
-          "tosca.capabilities.Endpoint" : [ {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "end_point",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Endpoint",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-            "ownerName" : "protected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.3bd24450-46ab-4e72-8b39-9d57c06e2ddf.end_point",
-            "capabilitySources" : [ "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "protected_private_network.end_point",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.protected_private_network.end_point",
-            "empty" : false
-          }, {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "end_point",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Endpoint",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-            "ownerName" : "unprotected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.3bd24450-46ab-4e72-8b39-9d57c06e2ddf.end_point",
-            "capabilitySources" : [ "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "unprotected_private_network.end_point",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.unprotected_private_network.end_point",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Node" : [ {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-            "ownerName" : "protected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "protected_private_network.feature",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.protected_private_network.feature",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.feature_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.feature_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.feature_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.feature_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.feature_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.feature_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.feature_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.feature_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.feature_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.feature_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.feature_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.feature_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.feature_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.feature_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.feature_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.feature_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.feature_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "feature",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-            "ownerName" : "unprotected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-            "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "unprotected_private_network.feature",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.unprotected_private_network.feature",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Scalable" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "scalable_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Scalable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.scalable_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.scalable_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "scalable_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Scalable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.scalable_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.scalable_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "scalable_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Scalable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.scalable_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.scalable_vfw",
-            "empty" : false
-          } ],
-          "org.openecomp.capabilities.Forwarder" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.forwarder_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.forwarder_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.forwarder_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.forwarder_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.forwarder_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.forwarder_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.forwarder_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.forwarder_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "forwarder_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "org.openecomp.capabilities.Forwarder",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_1_port",
-            "empty" : false
-          } ],
-          "tosca.capabilities.network.Bindable" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.binding_vsn_vsn_private_0_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vsn.binding_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.binding_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.binding_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.binding_vsn_vsn_private_1_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vsn.binding_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.binding_vpg_vpg_private_1_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vpg.binding_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.binding_vpg_vpg_private_0_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vpg.binding_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.binding_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.binding_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.binding_vfw_vfw_private_0_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.binding_vfw_vfw_private_2_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.binding_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.binding_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "binding_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.network.Bindable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.binding_vfw_vfw_private_1_port",
-            "minOccurrences" : "0",
-            "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-            "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_1_port",
-            "empty" : false
-          } ],
-          "org.openecomp.capabilities.PortMirroring" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "port_mirroring_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "org.openecomp.capabilities.PortMirroring",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.port_mirroring_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.port_mirroring_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "port_mirroring_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "org.openecomp.capabilities.PortMirroring",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.port_mirroring_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.port_mirroring_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "port_mirroring_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "org.openecomp.capabilities.PortMirroring",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.port_mirroring_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.port_mirroring_vfw_vfw_private_2_port",
-            "empty" : false
-          } ],
-          "tosca.capabilities.network.Linkable" : [ {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-            "ownerName" : "protected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.17f0d037-e999-41ad-9f3f-7d6faca229b1.link",
-            "capabilitySources" : [ "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "protected_private_network.link",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.protected_private_network.link",
-            "empty" : false
-          }, {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-            "ownerName" : "unprotected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.17f0d037-e999-41ad-9f3f-7d6faca229b1.link",
-            "capabilitySources" : [ "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "unprotected_private_network.link",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.unprotected_private_network.link",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Container" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "host_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Container",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.host_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-            "name" : "clivf30.abstract_vsn.host_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "host_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Container",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.host_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-            "name" : "clivf30.abstract_vpg.host_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "host_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Container",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.host_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-            "name" : "clivf30.abstract_vfw.host_vfw",
-            "empty" : false
-          } ],
-          "org.openecomp.capabilities.metric.Ceilometer" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.outgoing.bytes_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.bytes_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.outpoing.packets_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outpoing.packets_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.incoming.bytes_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.bytes_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.network.incoming.packets_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.packets_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.ephemeral.size_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.ephemeral.size_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.ephemeral.size_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "instance_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.instance_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.instance_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.memory_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.memory_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.iops_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.iops_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.iops_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.read.requests_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.read.requests_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu.delta_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.cpu.delta_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.cpu.delta_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.capacity_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.capacity_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.capacity_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.read.bytes_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.read.bytes_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.write.bytes_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.write.bytes_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.latency_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.latency_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.latency_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.read.bytes.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.read.bytes.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.usage_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.usage_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.usage_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_util_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.cpu_util_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.cpu_util_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.allocation_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.allocation_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.allocation_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.write.requests.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.write.requests.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.write.bytes.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.write.bytes.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.latency_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.latency_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.latency_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.cpu_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.cpu_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.write.requests_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.write.requests_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.write.bytes_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.write.bytes_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.requests_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.read.requests_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.read.requests_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.root.size_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.root.size_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.root.size_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.write.bytes.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.write.bytes.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "vcpus_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.vcpus_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.vcpus_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.iops_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.iops_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.iops_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.usage_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.usage_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.usage_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.read.requests.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.read.requests.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.write.requests.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.write.requests.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.allocation_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.allocation_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.allocation_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes.rate_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.read.bytes.rate_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.read.bytes.rate_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.read.bytes_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.read.bytes_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.usage_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.memory.usage_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.memory.usage_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.capacity_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.device.capacity_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.device.capacity_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.resident_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.memory.resident_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.memory.resident_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.disk.write.requests_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.disk.write.requests_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.outgoing.bytes_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.bytes_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.outpoing.packets_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outpoing.packets_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.incoming.bytes_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.bytes_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.network.incoming.packets_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.network.incoming.packets_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.outgoing.bytes_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.bytes_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.outpoing.packets_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outpoing.packets_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.incoming.bytes_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.bytes_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.network.incoming.packets_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.packets_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.outgoing.bytes_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.bytes_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.outpoing.packets_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outpoing.packets_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.incoming.bytes_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.bytes_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.network.incoming.packets_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.network.incoming.packets_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.ephemeral.size_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.ephemeral.size_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.ephemeral.size_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "instance_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.instance_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.instance_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.memory_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.memory_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.iops_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.iops_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.iops_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.read.requests_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.read.requests_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu.delta_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.cpu.delta_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.cpu.delta_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.capacity_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.capacity_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.capacity_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.read.bytes_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.read.bytes_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.write.bytes_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.write.bytes_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.latency_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.latency_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.latency_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.read.bytes.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.read.bytes.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.usage_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.usage_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.usage_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_util_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.cpu_util_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.cpu_util_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.allocation_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.allocation_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.allocation_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.write.requests.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.write.requests.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.write.bytes.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.write.bytes.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.latency_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.latency_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.latency_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.cpu_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.cpu_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.write.requests_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.write.requests_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.write.bytes_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.write.bytes_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.requests_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.read.requests_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.read.requests_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.root.size_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.root.size_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.root.size_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.write.bytes.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.write.bytes.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "vcpus_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.vcpus_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.vcpus_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.iops_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.iops_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.iops_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.usage_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.usage_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.usage_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.read.requests.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.read.requests.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.write.requests.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.write.requests.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.allocation_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.allocation_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.allocation_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes.rate_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.read.bytes.rate_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.read.bytes.rate_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.read.bytes_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.read.bytes_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.usage_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.memory.usage_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.memory.usage_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.capacity_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.device.capacity_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.device.capacity_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.resident_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.memory.resident_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.memory.resident_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.disk.write.requests_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.disk.write.requests_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.ephemeral.size_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.ephemeral.size_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.ephemeral.size_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "instance_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.instance_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.instance_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.memory_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.memory_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.iops_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.iops_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.iops_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.read.requests_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.read.requests_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu.delta_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.cpu.delta_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.cpu.delta_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.capacity_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.capacity_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.capacity_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.read.bytes_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.read.bytes_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.write.bytes_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.write.bytes_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.latency_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.latency_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.latency_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.bytes.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.read.bytes.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.read.bytes.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.usage_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.usage_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.usage_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_util_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.cpu_util_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.cpu_util_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.allocation_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.allocation_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.allocation_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.write.requests.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.write.requests.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.bytes.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.write.bytes.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.write.bytes.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.latency_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.latency_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.latency_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "cpu_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.cpu_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.cpu_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.write.requests_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.write.requests_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.write.bytes_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.write.bytes_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.requests_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.read.requests_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.read.requests_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.root.size_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.root.size_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.root.size_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.bytes.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.write.bytes.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.write.bytes.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "vcpus_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.vcpus_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.vcpus_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.iops_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.iops_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.iops_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.usage_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.usage_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.usage_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.read.requests.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.read.requests.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.read.requests.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.write.requests.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.write.requests.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.write.requests.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.allocation_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.allocation_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.allocation_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes.rate_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.read.bytes.rate_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.read.bytes.rate_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.read.bytes_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.read.bytes_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.read.bytes_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.usage_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.memory.usage_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.memory.usage_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.device.capacity_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.device.capacity_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.device.capacity_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "memory.resident_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.memory.resident_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.memory.resident_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "disk.write.requests_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-            "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.disk.write.requests_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.disk.write.requests_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets.rate_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outpoing.packets_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.bytes_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "network.incoming.packets_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-            "type" : "org.openecomp.capabilities.metric.Ceilometer",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_1_port",
-            "empty" : false
-          } ],
-          "tosca.capabilities.OperatingSystem" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "os_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.OperatingSystem",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.os_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.os_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "os_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.OperatingSystem",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.os_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.os_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "os_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.OperatingSystem",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.os_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.os_vfw",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Endpoint.Admin" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "endpoint_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Endpoint.Admin",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-            "previousName" : "abstract_vsn.endpoint_vsn",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.endpoint_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "endpoint_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Endpoint.Admin",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-            "previousName" : "abstract_vpg.endpoint_vpg",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.endpoint_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "endpoint_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Endpoint.Admin",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-            "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-            "previousName" : "abstract_vfw.endpoint_vfw",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.endpoint_vfw",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Attachment" : [ {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-            "ownerName" : "protected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.a7d9636e-e1ca-4656-8236-ca3738329695.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "protected_private_network.attachment",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.protected_private_network.attachment",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vsn.attachment_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.attachment_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vsn.attachment_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vsn.attachment_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vpg.attachment_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.attachment_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vpg.attachment_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vpg.attachment_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.attachment_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-            "previousName" : "abstract_vfw.attachment_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-            "previousName" : "abstract_vfw.attachment_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "attachment",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "type" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-            "ownerName" : "unprotected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "capability.a7d9636e-e1ca-4656-8236-ca3738329695.attachment",
-            "capabilitySources" : [ "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-            "previousName" : "unprotected_private_network.attachment",
-            "minOccurrences" : "1",
-            "validSourceTypes" : [ ],
-            "name" : "clivf30.unprotected_private_network.attachment",
-            "empty" : false
-          } ]
-        },
-        "requirements" : {
-          "tosca.capabilities.Node" : [ {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "protected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "protected_private_network.dependency",
-            "minOccurrences" : "0",
-            "name" : "clivf30.protected_private_network.dependency",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vsn.dependency_vsn_vsn_private_0_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vsn.dependency_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vsn.dependency_vsn",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vsn.dependency_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vsn.dependency_vsn_vsn_private_1_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vsn.dependency_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vpg.dependency_vpg_vpg_private_1_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vpg.dependency_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vpg.dependency_vpg_vpg_private_0_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vpg.dependency_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vpg.dependency_vpg",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vpg.dependency_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vfw.dependency_vfw_vfw_private_0_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vfw.dependency_vfw_vfw_private_2_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vfw.dependency_vfw",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vfw.dependency_vfw",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "abstract_vfw.dependency_vfw_vfw_private_1_port",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "dependency",
-            "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-            "node" : "tosca.nodes.Root",
-            "capability" : "tosca.capabilities.Node",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-            "relationship" : "tosca.relationships.DependsOn",
-            "ownerName" : "unprotected_private_network",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-            "previousName" : "unprotected_private_network.dependency",
-            "minOccurrences" : "0",
-            "name" : "clivf30.unprotected_private_network.dependency",
-            "empty" : false
-          } ],
-          "tosca.capabilities.network.Linkable" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vsn_vsn_private_0_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vsn.link_vsn_vsn_private_0_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vsn.link_vsn_vsn_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vsn_vsn_private_1_port",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vsn.link_vsn_vsn_private_1_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vsn.link_vsn_vsn_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vpg_vpg_private_1_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vpg.link_vpg_vpg_private_1_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vpg.link_vpg_vpg_private_1_port",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vpg_vpg_private_0_port",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vpg.link_vpg_vpg_private_0_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vpg.link_vpg_vpg_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vfw_vfw_private_0_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vfw.link_vfw_vfw_private_0_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_0_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vfw_vfw_private_2_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vfw.link_vfw_vfw_private_2_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_2_port",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "link_vfw_vfw_private_1_port",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "capability" : "tosca.capabilities.network.Linkable",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.network.LinksTo",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-            "previousName" : "abstract_vfw.link_vfw_vfw_private_1_port",
-            "minOccurrences" : "1",
-            "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_1_port",
-            "empty" : false
-          } ],
-          "tosca.capabilities.Attachment" : [ {
-            "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "local_storage_vsn",
-            "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-            "node" : "tosca.nodes.BlockStorage",
-            "capability" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-            "relationship" : "tosca.relationships.AttachesTo",
-            "ownerName" : "abstract_vsn",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-            "previousName" : "abstract_vsn.local_storage_vsn",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vsn.local_storage_vsn",
-            "empty" : false
-          }, {
-            "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "local_storage_vpg",
-            "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-            "node" : "tosca.nodes.BlockStorage",
-            "capability" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-            "relationship" : "tosca.relationships.AttachesTo",
-            "ownerName" : "abstract_vpg",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-            "previousName" : "abstract_vpg.local_storage_vpg",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vpg.local_storage_vpg",
-            "empty" : false
-          }, {
-            "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-            "parentName" : "local_storage_vfw",
-            "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-            "node" : "tosca.nodes.BlockStorage",
-            "capability" : "tosca.capabilities.Attachment",
-            "leftOccurrences" : "UNBOUNDED",
-            "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-            "relationship" : "tosca.relationships.AttachesTo",
-            "ownerName" : "abstract_vfw",
-            "maxOccurrences" : "UNBOUNDED",
-            "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-            "previousName" : "abstract_vfw.local_storage_vfw",
-            "minOccurrences" : "0",
-            "name" : "clivf30.abstract_vfw.local_storage_vfw",
-            "empty" : false
-          } ]
-        },
         "deploymentArtifacts" : {
-          "vflicense" : {
-            "creationDate" : 1553125008013,
+          "toscacsar" : {
+            "creationDate" : 1567068749786,
+            "description" : "Created by Open Command Platform - OCOMP",
             "timeout" : 0,
-            "description" : "VF license file",
-            "lastUpdateDate" : 1553125008013,
-            "artifactLabel" : "vflicense",
-            "artifactUUID" : "ba5e6fb3-7eca-4c74-9320-1283381dee5e",
-            "artifactVersion" : "1",
-            "artifactGroupType" : "DEPLOYMENT",
-            "artifactName" : "vf-license-model.xml",
-            "artifactType" : "VF_LICENSE",
-            "artifactDisplayName" : "VF License",
-            "updaterFullName" : "Carlos Santana",
-            "userIdLastUpdater" : "cs0008",
-            "mandatory" : false,
-            "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vflicense",
-            "artifactChecksum" : "ZmVmMjRmNjM2ZTgwYTg4NGM3YmJhY2MyODY5MzZkMjM=",
-            "serviceApi" : false,
-            "payloadUpdateDate" : 1553125008015,
-            "esId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vflicense",
-            "duplicated" : false,
-            "isFromCsar" : true,
-            "artifactCreator" : "cs0008",
-            "generated" : false,
-            "requiredArtifacts" : [ ],
-            "empty" : false
-          },
-          "vfModulesMetadata" : {
-            "timeout" : 0,
-            "description" : "Auto-generated VF Modules information artifact",
-            "artifactLabel" : "vfModulesMetadata",
-            "artifactUUID" : "59d04960-c716-4ceb-85d0-bc41d81d429c",
-            "artifactVersion" : "1",
-            "artifactGroupType" : "DEPLOYMENT",
-            "artifactName" : "clivf30_modules.json",
-            "artifactType" : "VF_MODULES_METADATA",
-            "artifactDisplayName" : "Vf Modules Metadata",
-            "mandatory" : false,
-            "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.vfModulesMetadata",
-            "artifactChecksum" : "ZDlkMTJjYjE3ZjhkNzMzMTQyZjc1YjYxZGE1NmVhZmU=",
-            "serviceApi" : false,
-            "payloadUpdateDate" : 1553192486560,
-            "esId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.vfModulesMetadata",
-            "duplicated" : false,
-            "isFromCsar" : false,
-            "generated" : false,
-            "empty" : false
-          },
-          "heat1" : {
-            "listHeatParameters" : [ {
-              "name" : "vfw_image_name",
-              "type" : "string",
-              "description" : "Image to be used for compute instance",
-              "currentValue" : "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)",
-              "empty" : false
-            }, {
-              "name" : "firewall_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for firewall VM",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "sink_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for vSink VM",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "packetgen_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for packet generator",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "public_net_id",
-              "type" : "string",
-              "description" : "Public network that enables remote connection to VNF",
-              "currentValue" : "PUT THE PUBLIC NETWORK ID HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vPacketGenerator with vFirewall",
-              "currentValue" : "zdfw1fwl01_unprotected",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vFirewall with vSink",
-              "currentValue" : "zdfw1fwl01_protected",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects ONAP components and the VNF",
-              "currentValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "onap_private_subnet_id",
-              "type" : "string",
-              "description" : "Private sub-network that connects ONAP components and the VNF",
-              "currentValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the unprotected private network",
-              "currentValue" : "192.168.10.0/24",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "currentValue" : "192.168.20.0/24",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "currentValue" : "10.0.0.0/16",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator",
-              "currentValue" : "192.168.10.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vSink",
-              "currentValue" : "192.168.20.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_2",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with ONAP components",
-              "currentValue" : "10.0.100.1",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall",
-              "currentValue" : "192.168.10.200",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components",
-              "currentValue" : "10.0.100.2",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with the vFirewall",
-              "currentValue" : "192.168.20.250",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with ONAP components",
-              "currentValue" : "10.0.100.3",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_2_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 2 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_name_0",
-              "type" : "string",
-              "description" : "Name of the vFirewall",
-              "currentValue" : "zdfw1fwl01fwl01",
-              "empty" : false
-            }, {
-              "name" : "vpg_name_0",
-              "type" : "string",
-              "description" : "Name of the vPacketGenerator",
-              "currentValue" : "zdfw1fwl01pgn01",
-              "empty" : false
-            }, {
-              "name" : "vsn_name_0",
-              "type" : "string",
-              "description" : "Name of the vSink",
-              "currentValue" : "zdfw1fwl01snk01",
-              "empty" : false
-            }, {
-              "name" : "vnf_id",
-              "type" : "string",
-              "description" : "The VNF ID is provided by ONAP",
-              "currentValue" : "vFirewall_demo_app",
-              "empty" : false
-            }, {
-              "name" : "vf_module_id",
-              "type" : "string",
-              "description" : "The vFirewall Module ID is provided by ONAP",
-              "currentValue" : "vFirewall",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_ip",
-              "type" : "string",
-              "description" : "IP address of the DCAE collector",
-              "currentValue" : "10.0.4.1",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_port",
-              "type" : "string",
-              "description" : "Port of the DCAE collector",
-              "currentValue" : "8081",
-              "empty" : false
-            }, {
-              "name" : "key_name",
-              "type" : "string",
-              "description" : "Public/Private key pair name",
-              "currentValue" : "vfw_key",
-              "empty" : false
-            }, {
-              "name" : "pub_key",
-              "type" : "string",
-              "description" : "Public key to be installed on the compute instance",
-              "currentValue" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN",
-              "empty" : false
-            }, {
-              "name" : "install_script_version",
-              "type" : "string",
-              "description" : "Version number of the scripts that install the vFW demo app",
-              "currentValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "demo_artifacts_version",
-              "type" : "string",
-              "description" : "Artifacts (jar, tar.gz) version used in demo vnfs",
-              "currentValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "nexus_artifact_repo",
-              "type" : "string",
-              "description" : "Root URL for the Nexus repository for Maven artifacts.",
-              "currentValue" : "https://nexus.onap.org",
-              "defaultValue" : "https://nexus.onap.org",
-              "empty" : false
-            }, {
-              "name" : "cloud_env",
-              "type" : "string",
-              "description" : "Cloud environment (e.g., openstack, rackspace)",
-              "currentValue" : "openstack",
-              "empty" : false
-            }, {
-              "name" : "sec_group",
-              "type" : "string",
-              "description" : "ONAP Security Group",
-              "currentValue" : "PUT THE ONAP SECURITY GROUP HERE",
-              "empty" : false
-            } ],
-            "creationDate" : 1553125008094,
-            "timeout" : 60,
-            "description" : "created from csar",
-            "lastUpdateDate" : 1553125008094,
-            "artifactLabel" : "heat1",
-            "artifactUUID" : "1ef7b10d-c9f1-4aa9-a354-6ede0049434a",
-            "artifactVersion" : "2",
-            "heatParameters" : [ {
-              "name" : "vfw_image_name",
-              "type" : "string",
-              "description" : "Image to be used for compute instance",
-              "currentValue" : "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)",
-              "empty" : false
-            }, {
-              "name" : "firewall_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for firewall VM",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "sink_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for vSink VM",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "packetgen_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for packet generator",
-              "currentValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "public_net_id",
-              "type" : "string",
-              "description" : "Public network that enables remote connection to VNF",
-              "currentValue" : "PUT THE PUBLIC NETWORK ID HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vPacketGenerator with vFirewall",
-              "currentValue" : "zdfw1fwl01_unprotected",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vFirewall with vSink",
-              "currentValue" : "zdfw1fwl01_protected",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects ONAP components and the VNF",
-              "currentValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "onap_private_subnet_id",
-              "type" : "string",
-              "description" : "Private sub-network that connects ONAP components and the VNF",
-              "currentValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the unprotected private network",
-              "currentValue" : "192.168.10.0/24",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "currentValue" : "192.168.20.0/24",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "currentValue" : "10.0.0.0/16",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator",
-              "currentValue" : "192.168.10.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vSink",
-              "currentValue" : "192.168.20.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_2",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with ONAP components",
-              "currentValue" : "10.0.100.1",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall",
-              "currentValue" : "192.168.10.200",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components",
-              "currentValue" : "10.0.100.2",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with the vFirewall",
-              "currentValue" : "192.168.20.250",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with ONAP components",
-              "currentValue" : "10.0.100.3",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_2_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 2 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 0 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 1 vnic type (normal, direct)",
-              "currentValue" : "normal or direct",
-              "defaultValue" : "normal",
-              "empty" : false
-            }, {
-              "name" : "vfw_name_0",
-              "type" : "string",
-              "description" : "Name of the vFirewall",
-              "currentValue" : "zdfw1fwl01fwl01",
-              "empty" : false
-            }, {
-              "name" : "vpg_name_0",
-              "type" : "string",
-              "description" : "Name of the vPacketGenerator",
-              "currentValue" : "zdfw1fwl01pgn01",
-              "empty" : false
-            }, {
-              "name" : "vsn_name_0",
-              "type" : "string",
-              "description" : "Name of the vSink",
-              "currentValue" : "zdfw1fwl01snk01",
-              "empty" : false
-            }, {
-              "name" : "vnf_id",
-              "type" : "string",
-              "description" : "The VNF ID is provided by ONAP",
-              "currentValue" : "vFirewall_demo_app",
-              "empty" : false
-            }, {
-              "name" : "vf_module_id",
-              "type" : "string",
-              "description" : "The vFirewall Module ID is provided by ONAP",
-              "currentValue" : "vFirewall",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_ip",
-              "type" : "string",
-              "description" : "IP address of the DCAE collector",
-              "currentValue" : "10.0.4.1",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_port",
-              "type" : "string",
-              "description" : "Port of the DCAE collector",
-              "currentValue" : "8081",
-              "empty" : false
-            }, {
-              "name" : "key_name",
-              "type" : "string",
-              "description" : "Public/Private key pair name",
-              "currentValue" : "vfw_key",
-              "empty" : false
-            }, {
-              "name" : "pub_key",
-              "type" : "string",
-              "description" : "Public key to be installed on the compute instance",
-              "currentValue" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN",
-              "empty" : false
-            }, {
-              "name" : "install_script_version",
-              "type" : "string",
-              "description" : "Version number of the scripts that install the vFW demo app",
-              "currentValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "demo_artifacts_version",
-              "type" : "string",
-              "description" : "Artifacts (jar, tar.gz) version used in demo vnfs",
-              "currentValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "nexus_artifact_repo",
-              "type" : "string",
-              "description" : "Root URL for the Nexus repository for Maven artifacts.",
-              "currentValue" : "https://nexus.onap.org",
-              "defaultValue" : "https://nexus.onap.org",
-              "empty" : false
-            }, {
-              "name" : "cloud_env",
-              "type" : "string",
-              "description" : "Cloud environment (e.g., openstack, rackspace)",
-              "currentValue" : "openstack",
-              "empty" : false
-            }, {
-              "name" : "sec_group",
-              "type" : "string",
-              "description" : "ONAP Security Group",
-              "currentValue" : "PUT THE ONAP SECURITY GROUP HERE",
-              "empty" : false
-            } ],
-            "artifactGroupType" : "DEPLOYMENT",
-            "artifactName" : "base_vfw.yaml",
-            "artifactType" : "HEAT",
-            "artifactDisplayName" : "base_vfw",
-            "updaterFullName" : "Carlos Santana",
-            "userIdLastUpdater" : "cs0008",
-            "mandatory" : false,
-            "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.heat1",
-            "artifactChecksum" : "NmFmYjA4N2ZjNDAxYjYyOGY0MjYzMGVlMDU3NWQ2OGE=",
-            "serviceApi" : false,
-            "payloadUpdateDate" : 1553125008148,
-            "esId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.heat1",
-            "duplicated" : false,
-            "isFromCsar" : true,
-            "artifactCreator" : "cs0008",
-            "generated" : false,
-            "requiredArtifacts" : [ ],
-            "empty" : false
-          },
-          "vendorlicense" : {
-            "creationDate" : 1553125007971,
-            "timeout" : 0,
-            "description" : " Vendor license file",
-            "lastUpdateDate" : 1553125007971,
-            "artifactLabel" : "vendorlicense",
-            "artifactUUID" : "f5e01fb9-2ea4-47d9-b8dd-7c79ee7c3742",
-            "artifactVersion" : "1",
+            "artifactType" : "OTHER",
+            "uniqueId" : "eeafae8a-9269-4109-b97c-63290957ae8f.toscacsar",
+            "artifactName" : "tosca-csar",
+            "artifactDisplayName" : "tosca csar",
+            "artifactLabel" : "toscacsar",
             "artifactGroupType" : "DEPLOYMENT",
-            "artifactName" : "vendor-license-model.xml",
-            "artifactType" : "VENDOR_LICENSE",
-            "artifactDisplayName" : "Vendor License",
             "updaterFullName" : "Carlos Santana",
             "userIdLastUpdater" : "cs0008",
             "mandatory" : false,
-            "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vendorlicense",
-            "artifactChecksum" : "MTg5NTFhNDVjYzhiNTU1OGYwYmU2N2MzZGJiNGZjMWM=",
             "serviceApi" : false,
-            "payloadUpdateDate" : 1553125007973,
-            "esId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vendorlicense",
-            "duplicated" : false,
-            "isFromCsar" : true,
             "artifactCreator" : "cs0008",
             "generated" : false,
-            "requiredArtifacts" : [ ],
-            "empty" : false
-          },
-          "heat1env" : {
-            "listHeatParameters" : [ {
-              "name" : "vfw_image_name",
-              "type" : "string",
-              "description" : "Image to be used for compute instance",
-              "defaultValue" : "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)",
-              "empty" : false
-            }, {
-              "name" : "firewall_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for firewall VM",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "sink_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for vSink VM",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "packetgen_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for packet generator",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "public_net_id",
-              "type" : "string",
-              "description" : "Public network that enables remote connection to VNF",
-              "defaultValue" : "PUT THE PUBLIC NETWORK ID HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vPacketGenerator with vFirewall",
-              "defaultValue" : "zdfw1fwl01_unprotected",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vFirewall with vSink",
-              "defaultValue" : "zdfw1fwl01_protected",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects ONAP components and the VNF",
-              "defaultValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "onap_private_subnet_id",
-              "type" : "string",
-              "description" : "Private sub-network that connects ONAP components and the VNF",
-              "defaultValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the unprotected private network",
-              "defaultValue" : "192.168.10.0/24",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "defaultValue" : "192.168.20.0/24",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "defaultValue" : "10.0.0.0/16",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator",
-              "defaultValue" : "192.168.10.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vSink",
-              "defaultValue" : "192.168.20.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_2",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with ONAP components",
-              "defaultValue" : "10.0.100.1",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall",
-              "defaultValue" : "192.168.10.200",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components",
-              "defaultValue" : "10.0.100.2",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with the vFirewall",
-              "defaultValue" : "192.168.20.250",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with ONAP components",
-              "defaultValue" : "10.0.100.3",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_2_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 2 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_name_0",
-              "type" : "string",
-              "description" : "Name of the vFirewall",
-              "defaultValue" : "zdfw1fwl01fwl01",
-              "empty" : false
-            }, {
-              "name" : "vpg_name_0",
-              "type" : "string",
-              "description" : "Name of the vPacketGenerator",
-              "defaultValue" : "zdfw1fwl01pgn01",
-              "empty" : false
-            }, {
-              "name" : "vsn_name_0",
-              "type" : "string",
-              "description" : "Name of the vSink",
-              "defaultValue" : "zdfw1fwl01snk01",
-              "empty" : false
-            }, {
-              "name" : "vnf_id",
-              "type" : "string",
-              "description" : "The VNF ID is provided by ONAP",
-              "defaultValue" : "vFirewall_demo_app",
-              "empty" : false
-            }, {
-              "name" : "vf_module_id",
-              "type" : "string",
-              "description" : "The vFirewall Module ID is provided by ONAP",
-              "defaultValue" : "vFirewall",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_ip",
-              "type" : "string",
-              "description" : "IP address of the DCAE collector",
-              "defaultValue" : "10.0.4.1",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_port",
-              "type" : "string",
-              "description" : "Port of the DCAE collector",
-              "defaultValue" : "8081",
-              "empty" : false
-            }, {
-              "name" : "key_name",
-              "type" : "string",
-              "description" : "Public/Private key pair name",
-              "defaultValue" : "vfw_key",
-              "empty" : false
-            }, {
-              "name" : "pub_key",
-              "type" : "string",
-              "description" : "Public key to be installed on the compute instance",
-              "defaultValue" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN",
-              "empty" : false
-            }, {
-              "name" : "install_script_version",
-              "type" : "string",
-              "description" : "Version number of the scripts that install the vFW demo app",
-              "defaultValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "demo_artifacts_version",
-              "type" : "string",
-              "description" : "Artifacts (jar, tar.gz) version used in demo vnfs",
-              "defaultValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "nexus_artifact_repo",
-              "type" : "string",
-              "description" : "Root URL for the Nexus repository for Maven artifacts.",
-              "defaultValue" : "https://nexus.onap.org",
-              "empty" : false
-            }, {
-              "name" : "cloud_env",
-              "type" : "string",
-              "description" : "Cloud environment (e.g., openstack, rackspace)",
-              "defaultValue" : "openstack",
-              "empty" : false
-            }, {
-              "name" : "sec_group",
-              "type" : "string",
-              "description" : "ONAP Security Group",
-              "defaultValue" : "PUT THE ONAP SECURITY GROUP HERE",
-              "empty" : false
-            } ],
-            "creationDate" : 1553191832138,
-            "timeout" : 0,
-            "description" : "Auto-generated HEAT Environment deployment artifact",
-            "lastUpdateDate" : 1553191832138,
-            "artifactLabel" : "heat1env",
-            "artifactUUID" : "b6f22323-f3d7-4068-9055-33c55e78e772",
-            "artifactVersion" : "2",
-            "heatParameters" : [ {
-              "name" : "vfw_image_name",
-              "type" : "string",
-              "description" : "Image to be used for compute instance",
-              "defaultValue" : "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)",
-              "empty" : false
-            }, {
-              "name" : "firewall_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for firewall VM",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "sink_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for vSink VM",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "packetgen_flavor_name",
-              "type" : "string",
-              "description" : "Type of instance (flavor) to be used for packet generator",
-              "defaultValue" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-              "empty" : false
-            }, {
-              "name" : "public_net_id",
-              "type" : "string",
-              "description" : "Public network that enables remote connection to VNF",
-              "defaultValue" : "PUT THE PUBLIC NETWORK ID HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vPacketGenerator with vFirewall",
-              "defaultValue" : "zdfw1fwl01_unprotected",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects vFirewall with vSink",
-              "defaultValue" : "zdfw1fwl01_protected",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_id",
-              "type" : "string",
-              "description" : "Private network that connects ONAP components and the VNF",
-              "defaultValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "onap_private_subnet_id",
-              "type" : "string",
-              "description" : "Private sub-network that connects ONAP components and the VNF",
-              "defaultValue" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-              "empty" : false
-            }, {
-              "name" : "unprotected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the unprotected private network",
-              "defaultValue" : "192.168.10.0/24",
-              "empty" : false
-            }, {
-              "name" : "protected_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "defaultValue" : "192.168.20.0/24",
-              "empty" : false
-            }, {
-              "name" : "onap_private_net_cidr",
-              "type" : "string",
-              "description" : "The CIDR of the protected private network",
-              "defaultValue" : "10.0.0.0/16",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator",
-              "defaultValue" : "192.168.10.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with the vSink",
-              "defaultValue" : "192.168.20.100",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_ip_2",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vFirewall to communicate with ONAP components",
-              "defaultValue" : "10.0.100.1",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall",
-              "defaultValue" : "192.168.10.200",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components",
-              "defaultValue" : "10.0.100.2",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_0",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with the vFirewall",
-              "defaultValue" : "192.168.20.250",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_ip_1",
-              "type" : "string",
-              "description" : "Private IP address that is assigned to the vSink to communicate with ONAP components",
-              "defaultValue" : "10.0.100.3",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_private_2_port_vnic_type",
-              "type" : "string",
-              "description" : "vfw port 2 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vsn_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vsn port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_0_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 0 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vpg_private_1_port_vnic_type",
-              "type" : "string",
-              "description" : "vpg port 1 vnic type (normal, direct)",
-              "defaultValue" : "normal or direct",
-              "empty" : false
-            }, {
-              "name" : "vfw_name_0",
-              "type" : "string",
-              "description" : "Name of the vFirewall",
-              "defaultValue" : "zdfw1fwl01fwl01",
-              "empty" : false
-            }, {
-              "name" : "vpg_name_0",
-              "type" : "string",
-              "description" : "Name of the vPacketGenerator",
-              "defaultValue" : "zdfw1fwl01pgn01",
-              "empty" : false
-            }, {
-              "name" : "vsn_name_0",
-              "type" : "string",
-              "description" : "Name of the vSink",
-              "defaultValue" : "zdfw1fwl01snk01",
-              "empty" : false
-            }, {
-              "name" : "vnf_id",
-              "type" : "string",
-              "description" : "The VNF ID is provided by ONAP",
-              "defaultValue" : "vFirewall_demo_app",
-              "empty" : false
-            }, {
-              "name" : "vf_module_id",
-              "type" : "string",
-              "description" : "The vFirewall Module ID is provided by ONAP",
-              "defaultValue" : "vFirewall",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_ip",
-              "type" : "string",
-              "description" : "IP address of the DCAE collector",
-              "defaultValue" : "10.0.4.1",
-              "empty" : false
-            }, {
-              "name" : "dcae_collector_port",
-              "type" : "string",
-              "description" : "Port of the DCAE collector",
-              "defaultValue" : "8081",
-              "empty" : false
-            }, {
-              "name" : "key_name",
-              "type" : "string",
-              "description" : "Public/Private key pair name",
-              "defaultValue" : "vfw_key",
-              "empty" : false
-            }, {
-              "name" : "pub_key",
-              "type" : "string",
-              "description" : "Public key to be installed on the compute instance",
-              "defaultValue" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN",
-              "empty" : false
-            }, {
-              "name" : "install_script_version",
-              "type" : "string",
-              "description" : "Version number of the scripts that install the vFW demo app",
-              "defaultValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "demo_artifacts_version",
-              "type" : "string",
-              "description" : "Artifacts (jar, tar.gz) version used in demo vnfs",
-              "defaultValue" : "1.3.0",
-              "empty" : false
-            }, {
-              "name" : "nexus_artifact_repo",
-              "type" : "string",
-              "description" : "Root URL for the Nexus repository for Maven artifacts.",
-              "defaultValue" : "https://nexus.onap.org",
-              "empty" : false
-            }, {
-              "name" : "cloud_env",
-              "type" : "string",
-              "description" : "Cloud environment (e.g., openstack, rackspace)",
-              "defaultValue" : "openstack",
-              "empty" : false
-            }, {
-              "name" : "sec_group",
-              "type" : "string",
-              "description" : "ONAP Security Group",
-              "defaultValue" : "PUT THE ONAP SECURITY GROUP HERE",
-              "empty" : false
-            } ],
-            "artifactGroupType" : "DEPLOYMENT",
-            "artifactName" : "base_vfw.env",
-            "artifactType" : "HEAT_ENV",
-            "artifactDisplayName" : "HEAT ENV",
-            "userIdCreator" : "cs0008",
-            "updaterFullName" : "Carlos Santana",
-            "creatorFullName" : "Carlos Santana",
-            "userIdLastUpdater" : "cs0008",
-            "mandatory" : true,
-            "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.heat1env",
-            "heatParamsUpdateDate" : 1553191832138,
-            "artifactChecksum" : "YzBhN2JiYjZhZDUzNTc4YjNmY2Y4YzM1NDZiZWMwOTA=",
-            "generatedFromId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.heat1",
-            "serviceApi" : false,
-            "payloadUpdateDate" : 1553192485382,
-            "esId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.heat1env",
-            "duplicated" : false,
             "isFromCsar" : false,
-            "generated" : false,
-            "empty" : false
-          }
-        },
-        "artifacts" : {
-          "vspclitest3informationtxt" : {
-            "creationDate" : 1553125008054,
-            "timeout" : 0,
-            "description" : "Artifact created from csar",
-            "lastUpdateDate" : 1553125008054,
-            "artifactLabel" : "vspclitest3informationtxt",
-            "artifactUUID" : "3489c4c1-e770-49ea-bb8b-86361e7d2a65",
+            "payloadUpdateDate" : 1567068750307,
+            "lastUpdateDate" : 1567068749786,
+            "artifactUUID" : "f6e14c15-09f7-4756-8470-6568474c4dd2",
             "artifactVersion" : "1",
-            "artifactGroupType" : "INFORMATIONAL",
-            "artifactName" : "VSP_cli-test-3_Information.txt",
-            "artifactType" : "GUIDE",
-            "artifactDisplayName" : "VSP_cli-test-3_Information",
-            "updaterFullName" : "Carlos Santana",
-            "userIdLastUpdater" : "cs0008",
-            "mandatory" : false,
-            "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vspclitest3informationtxt",
-            "artifactChecksum" : "ZDQxNWViNTFiYTQ5NWRmMWNmNDM4YjAxZTdlNjJiZjA=",
-            "serviceApi" : false,
-            "payloadUpdateDate" : 1553125008055,
-            "esId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vspclitest3informationtxt",
+            "artifactChecksum" : "YTVhYjY0OTYyMzMzMTM0ODI4ZmE2MGE4MWZiNjhlZmY=",
+            "esId" : "eeafae8a-9269-4109-b97c-63290957ae8f.toscacsar",
             "duplicated" : false,
-            "isFromCsar" : true,
-            "artifactCreator" : "cs0008",
-            "generated" : false,
-            "requiredArtifacts" : [ ],
             "empty" : false
           }
         },
-        "groupInstances" : [ {
-          "creationTime" : 1553191832196,
-          "version" : "1",
-          "type" : "org.openecomp.groups.VfModule",
-          "artifacts" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.heat1env", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.heat1" ],
-          "customizationUUID" : "5376c777-834e-433b-8f9e-65c7c0a7e4d1",
-          "normalizedName" : "clivf30clivf3base_vfwmodule0",
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.b3e0f162-5356-4b43-a9c0-3ab7e66638d2.CliVf3..base_vfw..module-0.clivf30clivf3base_vfwmodule0",
-          "modificationTime" : 1553191832196,
-          "groupName" : "CliVf3..base_vfw..module-0",
-          "groupUid" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.CliVf3..base_vfw..module-0",
-          "groupInstanceArtifacts" : [ "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30.heat1env" ],
-          "groupInstanceArtifactsUuid" : [ "b6f22323-f3d7-4068-9055-33c55e78e772" ],
-          "invariantUUID" : "87ffed3c-8ca7-41c9-b424-0c5dcde7b6c7",
-          "artifactsUuid" : [ "1ef7b10d-c9f1-4aa9-a354-6ede0049434a" ],
-          "groupUUID" : "83b97301-3ce1-4eb8-b1df-1313d736aae1",
-          "name" : "clivf30..CliVf3..base_vfw..module-0",
-          "properties" : [ {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.isBase.property.1",
-            "type" : "boolean",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "true",
-            "description" : "Whether this module should be deployed before other modules",
-            "password" : false,
-            "name" : "isBase",
-            "value" : "true",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.isBase",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.isBase",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.min_vf_module_instances.property.2",
-            "type" : "integer",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "1",
-            "description" : "The minimum instances of this VF-Module",
-            "password" : false,
-            "name" : "min_vf_module_instances",
-            "value" : "1",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.min_vf_module_instances",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.min_vf_module_instances",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances.property.3",
-            "type" : "integer",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "1",
-            "description" : "The maximum instances of this VF-Module",
-            "password" : false,
-            "name" : "max_vf_module_instances",
-            "value" : "1",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.initial_count.property.4",
-            "type" : "integer",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "1",
-            "description" : "The initial count of instances of the VF-Module. The value must be in the  range between min_vfmodule_instances and max_vfmodule_instances. If no value provided the initial count is the min_vfmodule_instances.\n",
-            "password" : false,
-            "name" : "initial_count",
-            "value" : "1",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.initial_count",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.initial_count",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_type.property.5",
-            "type" : "string",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "Base",
-            "password" : false,
-            "name" : "vf_module_type",
-            "value" : "Base",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_type",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_type",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_label.property.6",
-            "type" : "string",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "base_vfw",
-            "description" : "Alternate textual key used to reference this VF-Module model.  Must be unique within the VNF model\n",
-            "password" : false,
-            "name" : "vf_module_label",
-            "value" : "base_vfw",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_label",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_label",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.volume_group.property.7",
-            "type" : "boolean",
-            "required" : false,
-            "definition" : true,
-            "defaultValue" : "false",
-            "description" : "\"true\" indicates that this VF Module model requires attachment to a Volume   Group.  VID operator must select the Volume Group instance to attach to a VF-Module  at deployment time.\n",
-            "password" : false,
-            "name" : "volume_group",
-            "value" : "false",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.volume_group",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.volume_group",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vfc_list.property.8",
-            "type" : "map",
-            "required" : false,
-            "definition" : true,
-            "description" : "Identifies the set of VM types and their count included in the VF-Module\n",
-            "schema" : {
-              "property" : {
-                "type" : "string",
-                "required" : false,
-                "definition" : true,
-                "description" : "<vfc_id>:<count>",
-                "password" : false,
-                "hidden" : false,
-                "immutable" : false,
-                "getInputProperty" : false,
-                "empty" : false
-              },
-              "empty" : false
-            },
-            "password" : false,
-            "name" : "vfc_list",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vfc_list",
-            "schemaType" : "string",
-            "schemaProperty" : {
-              "type" : "string",
-              "required" : false,
-              "definition" : true,
-              "description" : "<vfc_id>:<count>",
-              "password" : false,
-              "hidden" : false,
-              "immutable" : false,
-              "getInputProperty" : false,
-              "empty" : false
-            },
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.vfc_list",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_description.property.9",
-            "type" : "string",
-            "required" : true,
-            "definition" : true,
-            "description" : "Description of the VF-modules contents and purpose   (e.g. \"Front-End\" or \"Database Cluster\")\n",
-            "password" : false,
-            "name" : "vf_module_description",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_description",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.vf_module_description",
-            "empty" : false
-          }, {
-            "uniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.availability_zone_count.property.10",
-            "type" : "integer",
-            "required" : false,
-            "definition" : true,
-            "description" : "Quantity of Availability Zones needed for this VF-Module     (source: Extracted from VF-Module HEAT template)\n",
-            "password" : false,
-            "name" : "availability_zone_count",
-            "hidden" : false,
-            "immutable" : false,
-            "parentUniqueId" : "org.openecomp.groups.VfModule.1.0.grouptype.availability_zone_count",
-            "getInputProperty" : false,
-            "ownerId" : "org.openecomp.groups.VfModule.1.0.grouptype.availability_zone_count",
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "actualComponentUid" : "86e7f0b5-e93f-45d7-b279-6e8d450fb1d9",
-        "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30",
-        "normalizedName" : "clivf30",
-        "name" : "cli-vf-3 0",
-        "creationTime" : 1553191832071,
-        "originType" : "VF",
-        "componentUid" : "86e7f0b5-e93f-45d7-b279-6e8d450fb1d9",
-        "customizationUUID" : "9634847f-2013-473d-a5db-10cab18b568e",
-        "componentVersion" : "1.0",
-        "componentName" : "cli-vf-3",
-        "toscaComponentName" : "org.openecomp.resource.vf.CliVf3",
-        "originArchived" : false,
-        "modificationTime" : 1553191832071,
-        "icon" : "defaulticon",
-        "isProxy" : false,
-        "invariantName" : "clivf30",
-        "posX" : "406",
-        "posY" : "248",
-        "propertyValueCounter" : 1,
-        "empty" : false
-      } ],
-      "componentInstancesRelations" : [ ],
-      "componentInstancesInputs" : {
-        "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" : [ {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vf_module_id",
-          "type" : "string",
+        "inputs" : [ {
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_naming",
+          "type" : "org.openecomp.datatypes.Naming",
           "required" : false,
           "definition" : false,
-          "description" : "The vFirewall Module ID is provided by ONAP",
           "password" : false,
-          "name" : "vf_module_id",
-          "value" : "vFirewall",
-          "label" : "vFirewall module ID",
+          "name" : "nf_naming",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.sink_flavor_name",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.skip_post_instantiation_configuration",
+          "type" : "boolean",
           "required" : false,
           "definition" : false,
-          "description" : "Type of instance (flavor) to be used for vSink VM",
           "password" : false,
-          "name" : "sink_flavor_name",
-          "value" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-          "label" : "Flavor",
+          "name" : "skip_post_instantiation_configuration",
+          "value" : "true",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.packetgen_flavor_name",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.multi_stage_design",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Type of instance (flavor) to be used for packet generator",
           "password" : false,
-          "name" : "packetgen_flavor_name",
-          "value" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-          "label" : "Flavor",
+          "name" : "multi_stage_design",
+          "value" : "false",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.nf_function",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_function",
           "type" : "string",
           "required" : false,
           "definition" : false,
@@ -5784,368 +460,177 @@
           "name" : "nf_function",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_ip_1",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Private IP address that is assigned to the vFirewall to communicate with the vSink",
-          "password" : false,
-          "name" : "vfw_private_ip_1",
-          "value" : "192.168.20.100",
-          "label" : "vFirewall private IP address towards the protected network",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.public_net_id",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Public network that enables remote connection to VNF",
-          "password" : false,
-          "name" : "public_net_id",
-          "value" : "PUT THE PUBLIC NETWORK ID HERE",
-          "label" : "Public network name or ID",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_ip_0",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator",
-          "password" : false,
-          "name" : "vfw_private_ip_0",
-          "value" : "192.168.10.100",
-          "label" : "vFirewall private IP address towards the unprotected network",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.onap_private_subnet_id",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Private sub-network that connects ONAP components and the VNF",
-          "password" : false,
-          "name" : "onap_private_subnet_id",
-          "value" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-          "label" : "ONAP management sub-network name or ID",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.sec_group",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "ONAP Security Group",
-          "password" : false,
-          "name" : "sec_group",
-          "value" : "PUT THE ONAP SECURITY GROUP HERE",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_ip_2",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Private IP address that is assigned to the vFirewall to communicate with ONAP components",
-          "password" : false,
-          "name" : "vfw_private_ip_2",
-          "value" : "10.0.100.1",
-          "label" : "vFirewall private IP address towards the ONAP management network",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.nf_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "password" : false,
-          "name" : "nf_type",
-          "hidden" : false,
-          "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_name_0",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Name of the vFirewall",
-          "password" : false,
-          "name" : "vfw_name_0",
-          "value" : "zdfw1fwl01fwl01",
-          "label" : "vFirewall name",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.nexus_artifact_repo",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Root URL for the Nexus repository for Maven artifacts.",
-          "password" : false,
-          "name" : "nexus_artifact_repo",
-          "value" : "https://nexus.onap.org",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.onap_private_net_cidr",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "The CIDR of the protected private network",
-          "password" : false,
-          "name" : "onap_private_net_cidr",
-          "value" : "10.0.0.0/16",
-          "label" : "ONAP private network CIDR",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vpg_private_1_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vpg port 1 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vpg_private_1_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_1_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vfw port 1 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vfw_private_1_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.dcae_collector_ip",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "IP address of the DCAE collector",
-          "password" : false,
-          "name" : "dcae_collector_ip",
-          "value" : "10.0.4.1",
-          "label" : "DCAE collector IP address",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vnf_id",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "The VNF ID is provided by ONAP",
-          "password" : false,
-          "name" : "vnf_id",
-          "value" : "vFirewall_demo_app",
-          "label" : "VNF ID",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vsn_private_1_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vsn port 1 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vsn_private_1_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.dcae_collector_port",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_naming_code",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Port of the DCAE collector",
           "password" : false,
-          "name" : "dcae_collector_port",
-          "value" : "8081",
-          "label" : "DCAE collector port",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_2_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vfw port 2 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vfw_private_2_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vpg_name_0",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Name of the vPacketGenerator",
-          "password" : false,
-          "name" : "vpg_name_0",
-          "value" : "zdfw1fwl01pgn01",
-          "label" : "vPacketGenerator name",
+          "name" : "nf_naming_code",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vsn_private_ip_0",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.availability_zone_max_count",
+          "type" : "integer",
           "required" : false,
           "definition" : false,
-          "description" : "Private IP address that is assigned to the vSink to communicate with the vFirewall",
           "password" : false,
-          "name" : "vsn_private_ip_0",
-          "value" : "192.168.20.250",
-          "label" : "vSink private IP address towards the protected network",
+          "name" : "availability_zone_max_count",
+          "value" : "1",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vpg_private_ip_1",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_model_version",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components",
           "password" : false,
-          "name" : "vpg_private_ip_1",
-          "value" : "10.0.100.2",
-          "label" : "vPacketGenerator private IP address towards the ONAP management network",
+          "name" : "sdnc_model_version",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vsn_private_ip_1",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_artifact_name",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Private IP address that is assigned to the vSink to communicate with ONAP components",
           "password" : false,
-          "name" : "vsn_private_ip_1",
-          "value" : "10.0.100.3",
-          "label" : "vSink private IP address towards the ONAP management network",
+          "name" : "sdnc_artifact_name",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vpg_private_ip_0",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_role",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall",
           "password" : false,
-          "name" : "vpg_private_ip_0",
-          "value" : "192.168.10.200",
-          "label" : "vPacketGenerator private IP address towards the unprotected network",
+          "name" : "nf_role",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.protected_private_net_cidr",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.max_instances",
+          "type" : "integer",
           "required" : false,
           "definition" : false,
-          "description" : "The CIDR of the protected private network",
           "password" : false,
-          "name" : "protected_private_net_cidr",
-          "value" : "192.168.20.0/24",
-          "label" : "Protected private network CIDR",
+          "name" : "max_instances",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.unprotected_private_net_cidr",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.min_instances",
+          "type" : "integer",
           "required" : false,
           "definition" : false,
-          "description" : "The CIDR of the unprotected private network",
           "password" : false,
-          "name" : "unprotected_private_net_cidr",
-          "value" : "192.168.10.0/24",
-          "label" : "Unprotected private network CIDR",
+          "name" : "min_instances",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_private_0_port_vnic_type",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_type",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "vfw port 0 vnic type (normal, direct)",
+          "schema" : {
+            "property" : {
+              "required" : false,
+              "definition" : true,
+              "password" : false,
+              "hidden" : false,
+              "immutable" : false,
+              "getInputProperty" : false,
+              "empty" : false
+            },
+            "empty" : false
+          },
           "password" : false,
-          "name" : "vfw_private_0_port_vnic_type",
-          "value" : "normal or direct",
+          "name" : "nf_type",
+          "value" : "hwvnfmdriver",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
+          "schemaProperty" : {
+            "required" : false,
+            "definition" : true,
+            "password" : false,
+            "hidden" : false,
+            "immutable" : false,
+            "getInputProperty" : false,
+            "empty" : false
+          },
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.firewall_flavor_name",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_model_name",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Type of instance (flavor) to be used for firewall VM",
           "password" : false,
-          "name" : "firewall_flavor_name",
-          "value" : "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
-          "label" : "Firewall Flavor",
+          "name" : "sdnc_model_name",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
-        }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.nf_naming",
+        } ],
+        "actualComponentUid" : "b85dad49-bd5c-4036-8eb0-601778b9d6ff",
+        "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.b85dad49-bd5c-4036-8eb0-601778b9d6ff.vgwocompvtp",
+        "normalizedName" : "vgwocompvtp",
+        "name" : "vgwocompvtp",
+        "creationTime" : 1567068773181,
+        "originType" : "VF",
+        "customizationUUID" : "ddf5c94a-539b-479f-afce-6da6115be9fd",
+        "invariantName" : "vgwocompvtp",
+        "componentUid" : "b85dad49-bd5c-4036-8eb0-601778b9d6ff",
+        "componentVersion" : "1.0",
+        "componentName" : "vgwocompvtp Vnf",
+        "toscaComponentName" : "org.openecomp.resource.vf.VgwocompvtpVnf",
+        "modificationTime" : 1567068773181,
+        "posX" : "406",
+        "posY" : "248",
+        "directives" : [ ],
+        "icon" : "defaulticon",
+        "originArchived" : false,
+        "isProxy" : false,
+        "propertyValueCounter" : 1,
+        "empty" : false
+      } ],
+      "componentInstancesRelations" : [ ],
+      "componentInstancesInputs" : {
+        "58620731-40a9-4f8e-95db-ef9fc478a705.b85dad49-bd5c-4036-8eb0-601778b9d6ff.vgwocompvtp" : [ {
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_naming",
           "type" : "org.openecomp.datatypes.Naming",
           "required" : false,
           "definition" : false,
@@ -6153,27 +638,27 @@
           "name" : "nf_naming",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vsn_name_0",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.skip_post_instantiation_configuration",
+          "type" : "boolean",
           "required" : false,
           "definition" : false,
-          "description" : "Name of the vSink",
           "password" : false,
-          "name" : "vsn_name_0",
-          "value" : "zdfw1fwl01snk01",
-          "label" : "vSink name",
+          "name" : "skip_post_instantiation_configuration",
+          "value" : "true",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.multi_stage_design",
-          "type" : "boolean",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.multi_stage_design",
+          "type" : "string",
           "required" : false,
           "definition" : false,
           "password" : false,
@@ -6181,26 +666,25 @@
           "value" : "false",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.onap_private_net_id",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_function",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Private network that connects ONAP components and the VNF",
           "password" : false,
-          "name" : "onap_private_net_id",
-          "value" : "PUT THE ONAP PRIVATE NETWORK NAME HERE",
-          "label" : "ONAP management network name or ID",
+          "name" : "nf_function",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.nf_naming_code",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_naming_code",
           "type" : "string",
           "required" : false,
           "definition" : false,
@@ -6208,52 +692,12 @@
           "name" : "nf_naming_code",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vpg_private_0_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vpg port 0 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vpg_private_0_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.unprotected_private_net_id",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Private network that connects vPacketGenerator with vFirewall",
-          "password" : false,
-          "name" : "unprotected_private_net_id",
-          "value" : "zdfw1fwl01_unprotected",
-          "label" : "Unprotected private network name or ID",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vsn_private_0_port_vnic_type",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "vsn port 0 vnic type (normal, direct)",
-          "password" : false,
-          "name" : "vsn_private_0_port_vnic_type",
-          "value" : "normal or direct",
-          "hidden" : false,
-          "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.availability_zone_max_count",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.availability_zone_max_count",
           "type" : "integer",
           "required" : false,
           "definition" : false,
@@ -6262,67 +706,38 @@
           "value" : "1",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.demo_artifacts_version",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_model_version",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Artifacts (jar, tar.gz) version used in demo vnfs",
           "password" : false,
-          "name" : "demo_artifacts_version",
-          "value" : "1.3.0",
-          "label" : "Artifacts version used in demo vnfs",
+          "name" : "sdnc_model_version",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.max_instances",
-          "type" : "integer",
-          "required" : false,
-          "definition" : false,
-          "password" : false,
-          "name" : "max_instances",
-          "hidden" : false,
-          "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.pub_key",
-          "type" : "string",
-          "required" : false,
-          "definition" : false,
-          "description" : "Public key to be installed on the compute instance",
-          "password" : false,
-          "name" : "pub_key",
-          "value" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN",
-          "label" : "Public key",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.key_name",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_artifact_name",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Public/Private key pair name",
           "password" : false,
-          "name" : "key_name",
-          "value" : "vfw_key",
-          "label" : "Key pair name",
+          "name" : "sdnc_artifact_name",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.nf_role",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_role",
           "type" : "string",
           "required" : false,
           "definition" : false,
@@ -6330,4539 +745,559 @@
           "name" : "nf_role",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.install_script_version",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.max_instances",
+          "type" : "integer",
           "required" : false,
           "definition" : false,
-          "description" : "Version number of the scripts that install the vFW demo app",
           "password" : false,
-          "name" : "install_script_version",
-          "value" : "1.3.0",
-          "label" : "Installation script version number",
+          "name" : "max_instances",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.vfw_image_name",
-          "type" : "string",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.min_instances",
+          "type" : "integer",
           "required" : false,
           "definition" : false,
-          "description" : "Image to be used for compute instance",
           "password" : false,
-          "name" : "vfw_image_name",
-          "value" : "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)",
-          "label" : "Image name or ID",
+          "name" : "min_instances",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.protected_private_net_id",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_type",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Private network that connects vFirewall with vSink",
-          "password" : false,
-          "name" : "protected_private_net_id",
-          "value" : "zdfw1fwl01_protected",
-          "label" : "Protected private network name or ID",
-          "hidden" : false,
-          "immutable" : false,
-          "getInputProperty" : false,
-          "empty" : false
-        }, {
-          "uniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995.min_instances",
-          "type" : "integer",
-          "required" : false,
-          "definition" : false,
+          "schema" : {
+            "property" : {
+              "required" : false,
+              "definition" : true,
+              "password" : false,
+              "hidden" : false,
+              "immutable" : false,
+              "getInputProperty" : false,
+              "empty" : false
+            },
+            "empty" : false
+          },
           "password" : false,
-          "name" : "min_instances",
+          "name" : "nf_type",
+          "value" : "hwvnfmdriver",
           "hidden" : false,
           "immutable" : false,
-          "parentUniqueId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
+          "schemaProperty" : {
+            "required" : false,
+            "definition" : true,
+            "password" : false,
+            "hidden" : false,
+            "immutable" : false,
+            "getInputProperty" : false,
+            "empty" : false
+          },
           "getInputProperty" : false,
-          "ownerId" : "d92e45a8-e84a-40a2-9a78-14fc63ad5995",
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         }, {
-          "uniqueId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.cloud_env",
+          "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.sdnc_model_name",
           "type" : "string",
           "required" : false,
           "definition" : false,
-          "description" : "Cloud environment (e.g., openstack, rackspace)",
           "password" : false,
-          "name" : "cloud_env",
-          "value" : "openstack",
-          "label" : "Cloud environment",
+          "name" : "sdnc_model_name",
           "hidden" : false,
           "immutable" : false,
+          "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "getInputProperty" : false,
+          "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
           "empty" : false
         } ]
       },
-      "capabilities" : {
-        "tosca.capabilities.Endpoint" : [ {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "end_point",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Endpoint",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-          "ownerName" : "protected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.3bd24450-46ab-4e72-8b39-9d57c06e2ddf.end_point",
-          "capabilitySources" : [ "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "protected_private_network.end_point",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.protected_private_network.end_point",
-          "empty" : false
-        }, {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "end_point",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Endpoint",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-          "ownerName" : "unprotected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.3bd24450-46ab-4e72-8b39-9d57c06e2ddf.end_point",
-          "capabilitySources" : [ "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "unprotected_private_network.end_point",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.unprotected_private_network.end_point",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Node" : [ {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-          "ownerName" : "protected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "protected_private_network.feature",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.protected_private_network.feature",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.feature_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.feature_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.feature_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.feature_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.feature_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.feature_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.feature_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.feature_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.feature_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.feature_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.feature_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.feature_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.feature_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.feature_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.feature_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.feature_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.feature_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.feature_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "feature",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-          "ownerName" : "unprotected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.0403862f-463a-4337-b41f-8110be0240e8.feature",
-          "capabilitySources" : [ "tosca.nodes.Root", "tosca.nodes.Root", "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "unprotected_private_network.feature",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.unprotected_private_network.feature",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Scalable" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "scalable_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Scalable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.scalable_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.scalable_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "scalable_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Scalable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.scalable_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.scalable_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "scalable_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Scalable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.scalable",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.scalable_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.scalable_vfw",
-          "empty" : false
-        } ],
-        "org.openecomp.capabilities.Forwarder" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.forwarder_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.forwarder_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.forwarder_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.forwarder_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.forwarder_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.forwarder_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.forwarder_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.forwarder_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "forwarder_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "org.openecomp.capabilities.Forwarder",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.forwarder",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.forwarder_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.forwarder_vfw_vfw_private_1_port",
-          "empty" : false
-        } ],
-        "tosca.capabilities.network.Bindable" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.binding_vsn_vsn_private_0_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vsn.binding_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.binding_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.binding_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.binding_vsn_vsn_private_1_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vsn.binding_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.binding_vpg_vpg_private_1_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vpg.binding_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.binding_vpg_vpg_private_0_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vpg.binding_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.binding_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.binding_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.binding_vfw_vfw_private_0_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.binding_vfw_vfw_private_2_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.binding",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.binding_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.binding_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "binding_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.network.Bindable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.binding",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.binding_vfw_vfw_private_1_port",
-          "minOccurrences" : "0",
-          "validSourceTypes" : [ "org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface", "org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface" ],
-          "name" : "clivf30.abstract_vfw.binding_vfw_vfw_private_1_port",
-          "empty" : false
-        } ],
-        "org.openecomp.capabilities.PortMirroring" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "port_mirroring_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "org.openecomp.capabilities.PortMirroring",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.port_mirroring_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.port_mirroring_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "port_mirroring_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "org.openecomp.capabilities.PortMirroring",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.port_mirroring_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.port_mirroring_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "port_mirroring_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "org.openecomp.capabilities.PortMirroring",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.3ec89893-eff4-4c9a-bdba-3646a556b408.port_mirroring",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.port_mirroring_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.port_mirroring_vfw_vfw_private_2_port",
-          "empty" : false
-        } ],
-        "tosca.capabilities.network.Linkable" : [ {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-          "ownerName" : "protected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.17f0d037-e999-41ad-9f3f-7d6faca229b1.link",
-          "capabilitySources" : [ "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "protected_private_network.link",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.protected_private_network.link",
-          "empty" : false
-        }, {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-          "ownerName" : "unprotected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.17f0d037-e999-41ad-9f3f-7d6faca229b1.link",
-          "capabilitySources" : [ "tosca.nodes.network.Network", "tosca.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.network.Network", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "unprotected_private_network.link",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.unprotected_private_network.link",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Container" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "host_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Container",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.host_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-          "name" : "clivf30.abstract_vsn.host_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "host_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Container",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.host_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-          "name" : "clivf30.abstract_vpg.host_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "host_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Container",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.host",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.host_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ "tosca.nodes.SoftwareComponent" ],
-          "name" : "clivf30.abstract_vfw.host_vfw",
-          "empty" : false
-        } ],
-        "org.openecomp.capabilities.metric.Ceilometer" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.outgoing.bytes_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.bytes_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.outpoing.packets_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outpoing.packets_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.incoming.bytes_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.bytes_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.network.incoming.packets_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.packets_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.ephemeral.size_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.ephemeral.size_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.ephemeral.size_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "instance_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.instance_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.instance_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.memory_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.memory_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.iops_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.iops_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.iops_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.read.requests_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.read.requests_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu.delta_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.cpu.delta_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.cpu.delta_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.capacity_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.capacity_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.capacity_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.read.bytes_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.read.bytes_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.write.bytes_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.write.bytes_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.latency_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.latency_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.latency_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.read.bytes.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.read.bytes.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.usage_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.usage_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.usage_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_util_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.cpu_util_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.cpu_util_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.allocation_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.allocation_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.allocation_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.write.requests.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.write.requests.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.write.bytes.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.write.bytes.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.latency_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.latency_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.latency_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.cpu_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.cpu_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.write.requests_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.write.requests_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.write.bytes_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.write.bytes_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.requests_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.read.requests_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.read.requests_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.root.size_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.root.size_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.root.size_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.write.bytes.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.write.bytes.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "vcpus_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.vcpus_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.vcpus_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.iops_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.iops_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.iops_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.usage_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.usage_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.usage_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.read.requests.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.read.requests.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.write.requests.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.write.requests.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.allocation_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.allocation_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.allocation_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes.rate_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.read.bytes.rate_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.read.bytes.rate_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.read.bytes_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.read.bytes_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.usage_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.memory.usage_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.memory.usage_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.capacity_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.device.capacity_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.device.capacity_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.resident_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.memory.resident_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.memory.resident_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.disk.write.requests_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.disk.write.requests_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.packets.rate_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.outgoing.bytes_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.bytes_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.packets.rate_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.outpoing.packets_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outpoing.packets_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.bytes.rate_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.incoming.bytes_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.bytes_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.outgoing.bytes.rate_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.network.incoming.packets_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.network.incoming.packets_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.outgoing.bytes_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.bytes_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.outpoing.packets_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outpoing.packets_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.incoming.bytes_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.bytes_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.network.incoming.packets_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.packets_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.packets.rate_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.outgoing.bytes_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.bytes_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.packets.rate_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.outpoing.packets_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outpoing.packets_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.bytes.rate_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.incoming.bytes_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.bytes_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.outgoing.bytes.rate_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.network.incoming.packets_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.network.incoming.packets_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.ephemeral.size_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.ephemeral.size_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.ephemeral.size_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "instance_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.instance_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.instance_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.memory_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.memory_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.iops_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.iops_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.iops_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.read.requests_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.read.requests_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu.delta_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.cpu.delta_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.cpu.delta_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.capacity_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.capacity_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.capacity_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.read.bytes_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.read.bytes_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.write.bytes_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.write.bytes_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.latency_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.latency_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.latency_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.read.bytes.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.read.bytes.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.usage_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.usage_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.usage_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_util_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.cpu_util_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.cpu_util_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.allocation_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.allocation_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.allocation_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.write.requests.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.write.requests.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.write.bytes.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.write.bytes.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.latency_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.latency_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.latency_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.cpu_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.cpu_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.write.requests_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.write.requests_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.write.bytes_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.write.bytes_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.requests_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.read.requests_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.read.requests_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.root.size_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.root.size_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.root.size_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.write.bytes.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.write.bytes.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "vcpus_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.vcpus_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.vcpus_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.iops_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.iops_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.iops_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.usage_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.usage_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.usage_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.read.requests.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.read.requests.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.write.requests.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.write.requests.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.allocation_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.allocation_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.allocation_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes.rate_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.read.bytes.rate_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.read.bytes.rate_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.read.bytes_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.read.bytes_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.usage_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.memory.usage_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.memory.usage_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.capacity_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.device.capacity_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.device.capacity_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.resident_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.memory.resident_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.memory.resident_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.disk.write.requests_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.disk.write.requests_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extCP", "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.ephemeral.size_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.ephemeral.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.ephemeral.size_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.ephemeral.size_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "instance_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.instance",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.instance_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.instance_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.memory_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.memory_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.iops_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.iops_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.iops_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.read.requests_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.read.requests_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu.delta_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu.delta",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.cpu.delta_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.cpu.delta_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.capacity_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.capacity_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.capacity_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.read.bytes_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.read.bytes_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.write.bytes_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.write.bytes_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.latency_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.latency_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.latency_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.bytes.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.read.bytes.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.read.bytes.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.usage_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.usage_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.usage_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_util_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu_util",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.cpu_util_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.cpu_util_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.allocation_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.allocation_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.allocation_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.write.requests.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.write.requests.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.bytes.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.write.bytes.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.write.bytes.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.latency_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.latency",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.latency_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.latency_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "cpu_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.cpu",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.cpu_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.cpu_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.write.requests_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.write.requests_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.write.bytes_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.write.bytes_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.requests_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.read.requests_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.read.requests_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.root.size_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.root.size",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.root.size_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.root.size_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.bytes.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.write.bytes.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.write.bytes.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "vcpus_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.vcpus",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.vcpus_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.vcpus_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.iops_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.iops",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.iops_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.iops_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.usage_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.usage_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.usage_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.read.requests.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.read.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.read.requests.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.read.requests.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.write.requests.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.write.requests.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.write.requests.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.write.requests.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.allocation_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.allocation",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.allocation_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.allocation_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes.rate_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.read.bytes.rate_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.read.bytes.rate_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.read.bytes_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.read.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.read.bytes_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.read.bytes_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.usage_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.usage",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.memory.usage_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.memory.usage_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.device.capacity_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.device.capacity",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.device.capacity_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.device.capacity_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "memory.resident_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.memory.resident",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.memory.resident_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.memory.resident_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "disk.write.requests_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d339b288-91e5-47b7-9445-93a7865f9383.disk.write.requests",
-          "capabilitySources" : [ "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.disk.write.requests_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.disk.write.requests_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets.rate_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets.rate_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.packets.rate_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.packets.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.packets.rate_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outpoing.packets_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outpoing.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outpoing.packets_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outpoing.packets_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes.rate_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes.rate_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.bytes_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.bytes",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.bytes_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.bytes_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.outgoing.bytes.rate",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.outgoing.bytes.rate_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "network.incoming.packets_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "description" : "A node type that includes the Metric capability indicates that it can be monitored using ceilometer.",
-          "type" : "org.openecomp.capabilities.metric.Ceilometer",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.d7afc1f8-06f8-41d7-8923-49bb7ac0e431.network.incoming.packets",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.network.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.network.incoming.packets_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.network.incoming.packets_vfw_vfw_private_1_port",
-          "empty" : false
-        } ],
-        "tosca.capabilities.OperatingSystem" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "os_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.OperatingSystem",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.os_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.os_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "os_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.OperatingSystem",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.os_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.os_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "os_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.OperatingSystem",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.os",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.os_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.os_vfw",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Endpoint.Admin" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "endpoint_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Endpoint.Admin",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vsn" ],
-          "previousName" : "abstract_vsn.endpoint_vsn",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.endpoint_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "endpoint_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Endpoint.Admin",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vpg" ],
-          "previousName" : "abstract_vpg.endpoint_vpg",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.endpoint_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "endpoint_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Endpoint.Admin",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.15c08f3e-60d4-412e-b8fb-e1b5516af4b6.endpoint",
-          "capabilitySources" : [ "tosca.nodes.Compute", "tosca.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.Compute", "org.openecomp.resource.vfc.nodes.heat.nova.Server", "org.openecomp.resource.vfc.CliVf3.abstract.compute.nodes.heat.vfw" ],
-          "previousName" : "abstract_vfw.endpoint_vfw",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.endpoint_vfw",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Attachment" : [ {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-          "ownerName" : "protected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.a7d9636e-e1ca-4656-8236-ca3738329695.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "protected_private_network.attachment",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.protected_private_network.attachment",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vsn.attachment_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.attachment_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vsn.attachment_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vsn.attachment_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vpg.attachment_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.attachment_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vpg.attachment_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vpg.attachment_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.attachment_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.v2.extNeutronCP", "org.openecomp.resource.cp.v2.extNeutronCP" ],
-          "previousName" : "abstract_vfw.attachment_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.bd27ff37-a40a-432c-b937-98e8f2c1798e.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.cp.nodes.heat.network.neutron.Port", "org.openecomp.resource.cp.nodes.heat.network.neutron.Port" ],
-          "previousName" : "abstract_vfw.attachment_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.abstract_vfw.attachment_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "attachment",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "type" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-          "ownerName" : "unprotected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "capability.a7d9636e-e1ca-4656-8236-ca3738329695.attachment",
-          "capabilitySources" : [ "org.openecomp.resource.vl.nodes.heat.network.neutron.Net", "org.openecomp.resource.vl.nodes.heat.network.neutron.Net" ],
-          "previousName" : "unprotected_private_network.attachment",
-          "minOccurrences" : "1",
-          "validSourceTypes" : [ ],
-          "name" : "clivf30.unprotected_private_network.attachment",
-          "empty" : false
-        } ]
-      },
-      "requirements" : {
-        "tosca.capabilities.Node" : [ {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.protected_private_network",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "protected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "protected_private_network.dependency",
-          "minOccurrences" : "0",
-          "name" : "clivf30.protected_private_network.dependency",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vsn.dependency_vsn_vsn_private_0_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vsn.dependency_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vsn.dependency_vsn",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vsn.dependency_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vsn.dependency_vsn_vsn_private_1_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vsn.dependency_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vpg.dependency_vpg_vpg_private_1_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vpg.dependency_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vpg.dependency_vpg_vpg_private_0_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vpg.dependency_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vpg.dependency_vpg",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vpg.dependency_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vfw.dependency_vfw_vfw_private_0_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vfw.dependency_vfw_vfw_private_2_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vfw.dependency_vfw",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vfw.dependency_vfw",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "abstract_vfw.dependency_vfw_vfw_private_1_port",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vfw.dependency_vfw_vfw_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "dependency",
-          "source" : "a7d9636e-e1ca-4656-8236-ca3738329695",
-          "node" : "tosca.nodes.Root",
-          "capability" : "tosca.capabilities.Node",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.a7d9636e-e1ca-4656-8236-ca3738329695.unprotected_private_network",
-          "relationship" : "tosca.relationships.DependsOn",
-          "ownerName" : "unprotected_private_network",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "0403862f-463a-4337-b41f-8110be0240e8.dependency",
-          "previousName" : "unprotected_private_network.dependency",
-          "minOccurrences" : "0",
-          "name" : "clivf30.unprotected_private_network.dependency",
-          "empty" : false
-        } ],
-        "tosca.capabilities.network.Linkable" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.bd27ff37-a40a-432c-b937-98e8f2c1798e.vsn_vsn_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vsn_vsn_private_0_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vsn.link_vsn_vsn_private_0_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vsn.link_vsn_vsn_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vsn_vsn_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vsn_vsn_private_1_port",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vsn.link_vsn_vsn_private_1_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vsn.link_vsn_vsn_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vpg_vpg_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vpg_vpg_private_1_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vpg.link_vpg_vpg_private_1_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vpg.link_vpg_vpg_private_1_port",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.bd27ff37-a40a-432c-b937-98e8f2c1798e.vpg_vpg_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vpg_vpg_private_0_port",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vpg.link_vpg_vpg_private_0_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vpg.link_vpg_vpg_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_0_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vfw_vfw_private_0_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vfw.link_vfw_vfw_private_0_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_0_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.4ac0251b-9ecb-4c4d-bb44-8ec29b5ce408.vfw_vfw_private_2_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vfw_vfw_private_2_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vfw.link_vfw_vfw_private_2_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_2_port",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.bd27ff37-a40a-432c-b937-98e8f2c1798e.vfw_vfw_private_1_port", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "link_vfw_vfw_private_1_port",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "capability" : "tosca.capabilities.network.Linkable",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.network.LinksTo",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "ede14c21-400d-4efc-b59b-fc7984696cbb.link",
-          "previousName" : "abstract_vfw.link_vfw_vfw_private_1_port",
-          "minOccurrences" : "1",
-          "name" : "clivf30.abstract_vfw.link_vfw_vfw_private_1_port",
-          "empty" : false
-        } ],
-        "tosca.capabilities.Attachment" : [ {
-          "path" : [ "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.de219353-4637-4a70-9f5d-1be3c49ebd0d.vsn", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "local_storage_vsn",
-          "source" : "f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb",
-          "node" : "tosca.nodes.BlockStorage",
-          "capability" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.f7e5b1a3-e4bc-4034-bd35-c71ee3d25beb.abstract_vsn",
-          "relationship" : "tosca.relationships.AttachesTo",
-          "ownerName" : "abstract_vsn",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-          "previousName" : "abstract_vsn.local_storage_vsn",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vsn.local_storage_vsn",
-          "empty" : false
-        }, {
-          "path" : [ "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.f16eb727-1432-4ec4-95d3-b472a4dc94b2.vpg", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "local_storage_vpg",
-          "source" : "47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44",
-          "node" : "tosca.nodes.BlockStorage",
-          "capability" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.47ed6a98-0daa-4c9e-9d1f-ea0b62a63c44.abstract_vpg",
-          "relationship" : "tosca.relationships.AttachesTo",
-          "ownerName" : "abstract_vpg",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-          "previousName" : "abstract_vpg.local_storage_vpg",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vpg.local_storage_vpg",
-          "empty" : false
-        }, {
-          "path" : [ "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.19e819e6-ce99-4428-9f66-b93d9aacdd19.vfw", "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw", "27cd11b7-083c-405a-bc2e-6d9e0cf37308.86e7f0b5-e93f-45d7-b279-6e8d450fb1d9.clivf30" ],
-          "parentName" : "local_storage_vfw",
-          "source" : "b48dfc0c-96da-463d-b36f-4b3c05a1e7e8",
-          "node" : "tosca.nodes.BlockStorage",
-          "capability" : "tosca.capabilities.Attachment",
-          "leftOccurrences" : "UNBOUNDED",
-          "ownerId" : "b3e0f162-5356-4b43-a9c0-3ab7e66638d2.b48dfc0c-96da-463d-b36f-4b3c05a1e7e8.abstract_vfw",
-          "relationship" : "tosca.relationships.AttachesTo",
-          "ownerName" : "abstract_vfw",
-          "maxOccurrences" : "UNBOUNDED",
-          "uniqueId" : "15c08f3e-60d4-412e-b8fb-e1b5516af4b6.local_storage",
-          "previousName" : "abstract_vfw.local_storage_vfw",
-          "minOccurrences" : "0",
-          "name" : "clivf30.abstract_vfw.local_storage_vfw",
-          "empty" : false
-        } ]
-      },
+      "capabilities" : { },
       "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
       "derivedFromGenericVersion" : "1.0",
       "toscaType" : "topology_template",
+      "nodeFilterComponents" : { },
       "interfaces" : { },
       "serviceApiArtifacts" : {
         "configuration" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "configuration",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.configuration",
           "artifactDisplayName" : "Configuration",
+          "artifactLabel" : "configuration",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.configuration",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "testing" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "testing",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.testing",
           "artifactDisplayName" : "Testing",
+          "artifactLabel" : "testing",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.testing",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "logging" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "logging",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.logging",
           "artifactDisplayName" : "Logging",
+          "artifactLabel" : "logging",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.logging",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "monitoring" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "monitoring",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.monitoring",
           "artifactDisplayName" : "Monitoring",
+          "artifactLabel" : "monitoring",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.monitoring",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "reporting" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "reporting",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.reporting",
           "artifactDisplayName" : "Reporting",
+          "artifactLabel" : "reporting",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.reporting",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "instantiation" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "instantiation",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.instantiation",
           "artifactDisplayName" : "Instantiation",
+          "artifactLabel" : "instantiation",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.instantiation",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
       "forwardingPaths" : { },
-      "distributionStatus" : "DISTRIBUTION_APPROVED",
-      "projectCode" : "000000",
       "environmentContext" : "General_Revenue-Bearing",
+      "projectCode" : "OCOMP",
       "serviceType" : "",
       "serviceRole" : "",
       "ecompGeneratedNaming" : true,
       "namingPolicy" : "",
       "instantiationType" : "A-la-carte",
-      "creationDate" : 1553191779187,
+      "distributionStatus" : "DISTRIBUTION_APPROVED",
       "version" : "1.0",
-      "description" : "create service model with cli",
-      "componentType" : "SERVICE",
-      "lifecycleState" : "CERTIFIED",
-      "systemName" : "CliServiceMod",
-      "lastUpdateDate" : 1553195028901,
-      "highestVersion" : true,
-      "creatorFullName" : "Joni Mitchell",
-      "normalizedName" : "cliservicemod",
+      "contactId" : "cs0008",
+      "creatorUserId" : "jm0007",
+      "lastUpdaterUserId" : "jm0007",
+      "lastUpdaterFullName" : "Joni Mitchell",
+      "creationDate" : 1567068764463,
       "actualComponentType" : "Service",
       "topologyTemplate" : true,
+      "tags" : [ "vgwocompvtp Service" ],
       "vspArchived" : false,
-      "archived" : false,
-      "contactId" : "cs0008",
+      "highestVersion" : true,
+      "allVersions" : {
+        "1.0" : "402a8ba7-5425-4072-8d05-40d7acbb4411"
+      },
+      "description" : "Created by Open Command Platform - OCOMP",
+      "uuid" : "ea98398d-1858-4a22-b227-74eb0e60df49",
       "conformanceLevel" : "9.0",
-      "lastUpdaterFullName" : "Joni Mitchell",
-      "tags" : [ "cli-service-mod" ],
-      "uniqueId" : "054425a1-5580-4758-ac33-ce817c8c7903",
-      "uuid" : "a4208283-3330-45f2-a0d4-4969931ffc06",
+      "uniqueId" : "402a8ba7-5425-4072-8d05-40d7acbb4411",
+      "creatorFullName" : "Joni Mitchell",
+      "normalizedName" : "vgwocompvtpservice",
+      "lifecycleState" : "CERTIFIED",
       "icon" : "defaulticon",
-      "lastUpdaterUserId" : "jm0007",
-      "creatorUserId" : "jm0007",
-      "invariantUUID" : "36a18432-57d2-4d67-b67a-19b219cc0113",
       "allArtifacts" : {
         "controlloopfunctions" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "controlloopfunctions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.controlloopfunctions",
           "artifactDisplayName" : "Control Loop Functions",
+          "artifactLabel" : "controlloopfunctions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.controlloopfunctions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "operationalpolicies" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "operationalpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.operationalpolicies",
           "artifactDisplayName" : "Operational Policies",
+          "artifactLabel" : "operationalpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.operationalpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "certificationtestresults" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "certificationtestresults",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.certificationtestresults",
           "artifactDisplayName" : "TD Certification Test Results",
+          "artifactLabel" : "certificationtestresults",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.certificationtestresults",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "deploymentvotingrecord" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "deploymentvotingrecord",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.deploymentvotingrecord",
           "artifactDisplayName" : "Deployment Voting Record",
+          "artifactLabel" : "deploymentvotingrecord",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.deploymentvotingrecord",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicequestionnaire" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicequestionnaire",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicequestionnaire",
           "artifactDisplayName" : "Service Questionnaire",
+          "artifactLabel" : "servicequestionnaire",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicequestionnaire",
           "serviceApi" : false,
-          "duplicated" : false,
+          "generated" : false,
           "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
+          "empty" : false
+        },
+        "toscacsar" : {
+          "creationDate" : 1567068779671,
+          "description" : "Created by Open Command Platform - OCOMP",
+          "timeout" : 0,
+          "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.toscacsar",
+          "artifactName" : "tosca-csar",
+          "artifactDisplayName" : "tosca csar",
+          "artifactLabel" : "toscacsar",
+          "artifactGroupType" : "INFORMATIONAL",
+          "updaterFullName" : "Carlos Santana",
+          "userIdLastUpdater" : "cs0008",
+          "mandatory" : false,
+          "serviceApi" : false,
+          "artifactCreator" : "cs0008",
           "generated" : false,
+          "isFromCsar" : false,
+          "payloadUpdateDate" : 1567068780186,
+          "lastUpdateDate" : 1567068779671,
+          "artifactUUID" : "5bc1a821-7c50-4b92-8d21-8ad44c1713fb",
+          "artifactVersion" : "1",
+          "artifactChecksum" : "YTVhYjY0OTYyMzMzMTM0ODI4ZmE2MGE4MWZiNjhlZmY=",
+          "esId" : "58620731-40a9-4f8e-95db-ef9fc478a705.toscacsar",
+          "duplicated" : false,
           "empty" : false
         },
         "dimensioninginfo" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "dimensioninginfo",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.dimensioninginfo",
           "artifactDisplayName" : "Dimensioning Info",
+          "artifactLabel" : "dimensioninginfo",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.dimensioninginfo",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "affinityrules" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "affinityrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.affinityrules",
           "artifactDisplayName" : "Affinity Rules",
+          "artifactLabel" : "affinityrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.affinityrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "serviceartifactplan" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "serviceartifactplan",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.serviceartifactplan",
           "artifactDisplayName" : "Service Artifact Plan",
+          "artifactLabel" : "serviceartifactplan",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.serviceartifactplan",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicespecificpolicies" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicespecificpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicespecificpolicies",
           "artifactDisplayName" : "Service-specific Policies",
+          "artifactLabel" : "servicespecificpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicespecificpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicesecuritytemplate" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "servicesecuritytemplate",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicesecuritytemplate",
           "artifactDisplayName" : "Service Security Template",
+          "artifactLabel" : "servicesecuritytemplate",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.servicesecuritytemplate",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "engineeringrules" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "engineeringrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.engineeringrules",
           "artifactDisplayName" : "Engineering Rules (ERD)",
+          "artifactLabel" : "engineeringrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.engineeringrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "distributioninstructions" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "distributioninstructions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.distributioninstructions",
           "artifactDisplayName" : "Distribution Instructions",
+          "artifactLabel" : "distributioninstructions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.distributioninstructions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "summaryofimpactstoecompelements" : {
-          "creationDate" : 1553191779121,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553191779121,
-          "artifactLabel" : "summaryofimpactstoecompelements",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.summaryofimpactstoecompelements",
           "artifactDisplayName" : "Summary of impacts to ECOMP elements,OSSs, BSSs",
+          "artifactLabel" : "summaryofimpactstoecompelements",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "27cd11b7-083c-405a-bc2e-6d9e0cf37308.summaryofimpactstoecompelements",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
-      "allVersions" : {
-        "1.0" : "054425a1-5580-4758-ac33-ce817c8c7903"
-      },
+      "componentType" : "SERVICE",
+      "systemName" : "VgwocompvtpService",
+      "lastUpdateDate" : 1567068821719,
+      "archived" : false,
+      "invariantUUID" : "1b6d7385-916d-4f96-aebd-f2cd03c59079",
       "archiveTime" : 0,
-      "name" : "cli-service-mod"
+      "name" : "vgwocompvtp Service"
     }
   }
 } ]
 \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-sample.yaml
index e085605e..ca97df9c 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-approve-schema-dublin-sample.yaml
@@ -1,22 +1,10 @@
-# Copyright © Intel Corporation 2019
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 open_cli_sample_version: 1.0
-name: -b
+name: service-model-approve
 version: onap-dublin
 samples:
   sample1:
-    name: -b
-    input: 054425a1-5580-4758-ac33-ce817c8c7903 -r approved cli -u gv0001 -p demo123456! -m http://10.12.6.129:30205
+    name: service-model-approve
+    input: --format json --remarks Created by Open Command Platform - OCOMP --service-id 402a8ba7-5425-4072-8d05-40d7acbb4411
     moco: service-model-approve-schema-dublin-moco.json
-    output:
-\ No newline at end of file
+    output: |
+      [{}]
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
index 5b39b846..943796df 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Approves the Service model in SDC
 
 info:
   product: onap-dublin
-  service: sdc
+  service: sdc.catalog
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
 
 parameters:
-  - name: service-model-uniqueId
-    description: Service model UniqueId (can be found by running service-model-list)
+  - name: service-id
+    description: Service model UniqueId
     type: string
-    long_option: service-model-uniqueId
+    long_option: service-id
     short_option: b
     is_optional: false
   - name: remarks
@@ -43,7 +43,7 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution-state/approve
+    uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution-state/approve
     method: POST
     body: '{"userRemarks": "${remarks}"}'
   success_codes:
author	Kanagaraj Manickam <mkr1481@gmail.com>	2019-08-29 16:43:18 +0530
committer	Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>	2019-08-29 16:43:18 +0530
commit	aaa51ac88c0921840263b67a2cc1f5c17f8c09d5 (patch)
tree	6058913e4c57e11576bc168a1fdaaa163d8aa51e /products
parent	a484da85eaa57c41cb26b929de3485750f10a08c (diff)