Fixed bugs in CLI commands

-Fixed bug in get-resoure-module-name -Changed vf-module-delete, vnf-delete and service-instance-delete to use AAI API instead of SO -Delete vf-module-delete, vnf-delete and service-instance-delete amd service-show-resource-module-name files from SO directory Issue-ID: CLI-163 Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com> Change-Id: I4f9a80751d19d31db8e8a23dbaa42161b9de38c2
author: Itohan <itohan.ukponmwan@intel.com> 2019-05-22 18:07:33 +0000
committer: Itohan <itohan.ukponmwan@intel.com> 2019-05-22 21:09:02 +0000
commit: 989678694e5960cb43ea5c0d37052b736b639423 (patch)
tree: 40fa29f85bb902390275d8825d8c1410db421efd /products
parent: 295dccc79512bbf5737b278d340156e0c81035dd (diff)
16 files changed, 5823 insertions, 444 deletions
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..ac6afd41
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/nodes/service-instances/service-instance/27f8ce0d-5906-46d9-bfb6-3b5664d889bf",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-d7a8f93f-ee5c-40b9-bc5e-71dacc7843da",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..8b98823a
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: 27f8ce0d-5906-46d9-bfb6-3b5664d889bf -y 1558550362930 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: service-instance-delete-schema-dublin-moco.json
+    output:
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..dfb50ec6
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/network/generic-vnfs/generic-vnf/9c003710-73f8-4df9-b63b-2c42af20059f/vf-modules/vf-module/bd45e41e-5190-48d7-87f4-81d53da87452",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-7f7f246d-0b15-4954-8f59-547f78563463",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..562c0f1e
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: 9c003710-73f8-4df9-b63b-2c42af20059f -y bd45e41e-5190-48d7-87f4-81d53da87452 -r 1558557415544 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: vf-module-delete-schema-dublin-moco.json
+    output:
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..3d7a596a
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/network/generic-vnfs/generic-vnf/cc4b6782-4c65-4d42-b015-513a7eb1af4c",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-693f0342-1ad5-417c-a972-28cd41112d93",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..b658db16
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: cc4b6782-4c65-4d42-b015-513a7eb1af4c -y 1558558004300 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: vnf-delete-schema-dublin-moco.json
+    output:
+\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml
new file mode 100644
index 00000000..c960fd50
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml
@@ -0,0 +1,46 @@
+#  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_schema_version: 1.0
+name: service-instance-delete
+description: Delete a service instance from ONAP
+
+info:
+  product: onap-dublin
+  service: aai
+  author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
+
+parameters:
+  - name: service-instance-id
+    description: Id of service-instance to be deleted (get from service-instance-list)
+    type: string
+    short_option: x
+    long_option: service-instance-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of service instance to be deleted
+    type: uuid
+    short_option: y
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v14/nodes/service-instances/service-instance/${service-instance-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml
new file mode 100644
index 00000000..904d57b0
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml
@@ -0,0 +1,52 @@
+#  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_schema_version: 1.0
+name: vf-module-delete
+description: Delete a VF module from Onap
+
+info:
+  product: onap-dublin
+  service: aai
+  author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
+
+parameters:
+  - name: vnf-id
+    description: Id of VNF that vf module belongs to
+    type: string
+    short_option: x
+    long_option: vnf-id
+    is_optional: false
+  - name: vf-module-id
+    description: Id of the vf module
+    type: string
+    short_option: y
+    long_option: vf-module-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of vf-module
+    type: uuid
+    short_option: r
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v14/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules/vf-module/${vf-module-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml
new file mode 100644
index 00000000..d49310e2
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml
@@ -0,0 +1,46 @@
+#  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_schema_version: 1.0
+name: vnf-delete
+description: Delete a VNF instancefrom Onap
+
+info:
+  product: onap-dublin
+  service: aai
+  author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
+
+parameters:
+  - name: vnf-id
+    description: Id of VNF to be deleted (get from vnf-list)
+    type: string
+    short_option: x
+    long_option: vnf-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of vnf
+    type: uuid
+    short_option: y
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v14/network/generic-vnfs/generic-vnf/${vnf-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-moco.json
index 9efdd734..31037dba 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-moco.json
@@ -7,7 +7,7 @@
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-0ff67b63-5fcb-4f84-b8e0-3e103aa239b3",
+      "X-TransactionId" : "req-ae9cae75-bba1-4b0d-9c30-afa83fb73c90",
       "Content-Type" : "application/json"
     },
     "json" : null
@@ -37,41 +37,2594 @@
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
         "interfaces" : { },
-        "vendorName" : "ffc7ea3e-5407-44f6-9dcb",
+        "vendorName" : "8fbcdb42-dbee-45c9-a8a8",
         "vendorRelease" : "1.0",
         "resourceVendorModelNumber" : "",
-        "toscaResourceName" : "org.openecomp.resource.vf.B6e67bfdA2164168A16e",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vlbms8e07b9c6D3c4",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558374638356,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558374705333,
+        "csarUUID" : "d2c96034f75a4226904778b68c37d29a",
+        "csarVersion" : "1.0",
+        "tags" : [ "vLBMS 8e07b9c6-d3c4" ],
+        "highestVersion" : true,
+        "uuid" : "9af91122-2902-4b79-8562-6fb810a4c2e9",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vlbms8e07b9c6D3c4",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbms8e07b9c6d3c4",
+        "uniqueId" : "751620a0-410c-4e44-b07d-b08ab4124440",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "85028b20-f02f-401f-abd5-c5c19bf6f72b",
+        "name" : "vLBMS 8e07b9c6-d3c4"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "2bba158e-4867-45f2-9f3b",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemu116563a359c5",
+        "resourceType" : "VF",
         "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558508252611,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558508278445,
+        "csarUUID" : "3aa5a72d8b3b4293b102a0bdfd6644ac",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu 116563a3-59c5" ],
+        "highestVersion" : true,
+        "uuid" : "c6781cde-7f50-418c-add2-b72290a4708c",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemu116563a359c5",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemu116563a359c5",
+        "uniqueId" : "c661e50c-b154-4ed8-9796-cee44c3c436c",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "609e58a6-0c43-435b-b484-b95ee175c033",
+        "name" : "vCPE_vbrgemu 116563a3-59c5"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "51fe6ae4-5f02-4824-aa61",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbngB0b33b8d4dca",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558015884721,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558015938785,
+        "csarUUID" : "bf60bd99364e41168a88058fafed1284",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng b0b33b8d-4dca" ],
+        "highestVersion" : true,
+        "uuid" : "d74c42ba-b281-46ac-a405-00c3303ab707",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbngB0b33b8d4dca",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbngb0b33b8d4dca",
+        "uniqueId" : "374fd12b-0985-4d19-9b86-48b24eb47b0f",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "ae0ca2e9-921e-455d-98e7-60008f03443a",
+        "name" : "vCPE_vbng b0b33b8d-4dca"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "a68dc563-abd0-4a35-b6ac",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnkC6892c13Ed34",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558043554364,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558043669524,
+        "csarUUID" : "c1cbfcbe696544f79e92a1951d295c8d",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK c6892c13-ed34" ],
+        "highestVersion" : true,
+        "uuid" : "165ce2b2-0a65-4ee9-a4a6-13eefc8236ba",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnkC6892c13Ed34",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnkc6892c13ed34",
+        "uniqueId" : "75f8a684-eb0a-407a-8b79-82a47a2d1af4",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "5ba65a28-0e54-4a77-b447-23e17f97583c",
+        "name" : "vFWCL_vFWSNK c6892c13-ed34"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "d1b88e82-ebcd-4674-b1ac",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmux17b1ee63Ab6f",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558376899670,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558376947005,
+        "csarUUID" : "425790b59ddb45488df07dcf537f34dd",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux 17b1ee63-ab6f" ],
+        "highestVersion" : true,
+        "uuid" : "44da3aea-bdb4-4d42-800a-25cacaab72fe",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmux17b1ee63Ab6f",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmux17b1ee63ab6f",
+        "uniqueId" : "cf33be4b-a815-43a8-a756-169431552ca0",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "a204024e-82f8-4fee-af85-9cebeb251a08",
+        "name" : "vCPE_vgmux 17b1ee63-ab6f"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "4e4cbf76-993a-4521-aeca",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vfw0d9bc23eDd98",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558127325017,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558127476694,
+        "csarUUID" : "bb740ece9ecc4a3191243d97543ff74d",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFW 0d9bc23e-dd98" ],
+        "highestVersion" : true,
+        "uuid" : "7c767465-d3f0-4c5e-84f6-8876a6e1f067",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vfw0d9bc23eDd98",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfw0d9bc23edd98",
+        "uniqueId" : "d55937ea-2c14-41b6-b8cb-ce71cd1763c7",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "186dffae-5d68-4fe0-84ca-0ccda8b6c9dd",
+        "name" : "vFW 0d9bc23e-dd98"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "90d43870-4764-4ea5-93c1",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbng4d9e3f9cF17c",
         "resourceType" : "VF",
+        "abstract" : false,
         "version" : "1.0",
-        "tags" : [ "b6e67bfd-a216-4168-a16e" ],
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558375950443,
+        "lastUpdaterFullName" : "Carlos Santana",
         "description" : "vendor software product",
-        "creationDate" : 1554244581380,
+        "lastUpdateDate" : 1558376004276,
+        "csarUUID" : "505fdb33dc164f1bbdca368f7c43b888",
         "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng 4d9e3f9c-f17c" ],
+        "highestVersion" : true,
+        "uuid" : "755a0a23-fb7a-4417-8857-d0c3deb3d10f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbng4d9e3f9cF17c",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbng4d9e3f9cf17c",
+        "uniqueId" : "7599c9fe-45a6-4a77-903e-1904c2e9fd25",
+        "allArtifacts" : { },
         "archived" : false,
         "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "3c5efff4-1619-4709-b5ba-0792bf353168",
+        "name" : "vCPE_vbng 4d9e3f9c-f17c"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "50c78393-b31d-4180-9533",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkg939507b50e51",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558013295612,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558013337102,
+        "csarUUID" : "a7c379ab7c204e289247a412efb1eb54",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG 939507b5-0e51" ],
         "highestVersion" : true,
-        "uniqueId" : "512dd581-fe42-4e82-b08e-13f5ed5ec071",
+        "uuid" : "70687089-f59c-47c1-acfa-4bc8a9d28399",
         "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkg939507b50e51",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkg939507b50e51",
+        "uniqueId" : "269b9779-e29c-459e-a245-9b80e8a98a6a",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "fab72b64-5697-4248-9275-fd32f5a4b72b",
+        "name" : "vFWCL_vPKG 939507b5-0e51"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "94708ad9-4034-474d-992b",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgwDec03da1Abb0",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558377384748,
         "lastUpdaterFullName" : "Carlos Santana",
-        "normalizedName" : "b6e67bfda2164168a16e",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558377443860,
+        "csarUUID" : "76a369148e1e4e9e8ad9f14163e41708",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw dec03da1-abb0" ],
+        "highestVersion" : true,
+        "uuid" : "a3c6b14a-2da9-484c-8cc0-8ca6790a5962",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
         "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgwDec03da1Abb0",
         "actualComponentType" : "VF",
         "topologyTemplate" : true,
+        "normalizedName" : "vcpevgwdec03da1abb0",
+        "uniqueId" : "5550b16d-d18f-4997-8ac3-062a4e8274ad",
         "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
         "icon" : "defaulticon",
-        "invariantUUID" : "7037ee95-babf-4324-a942-e6cf4a99473b",
-        "uuid" : "de0e7941-a28b-4b07-8ba5-b5eb2a39b476",
+        "invariantUUID" : "2d39f476-57a6-483f-8ea4-41fd52629300",
+        "name" : "vCPE_vgw dec03da1-abb0"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "43e014ca-e745-458d-b791",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vlbms5bad2e22Af57",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558044817735,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558044946278,
+        "csarUUID" : "bcb9479ba5774553be3782097359b5da",
+        "csarVersion" : "1.0",
+        "tags" : [ "vLBMS 5bad2e22-af57" ],
+        "highestVersion" : true,
+        "uuid" : "b16bc664-29bc-4bd0-984d-6e768c8583e9",
+        "contactId" : "cs0008",
         "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vlbms5bad2e22Af57",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbms5bad2e22af57",
+        "uniqueId" : "0df5f9da-6eae-4f51-aaf5-4f6d97b30845",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "d1c4364b-a122-4bc5-ba3e-9acd88788643",
+        "name" : "vLBMS 5bad2e22-af57"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "73c4bb2b-b966-460f-930a",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbng2349fd565070",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
         "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558046743026,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558046808025,
+        "csarUUID" : "58a8c3e21bf24485b2f96367e0404af6",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng 2349fd56-5070" ],
+        "highestVersion" : true,
+        "uuid" : "d36c91a9-f648-459d-b4c3-ba5fd54e1960",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
         "componentType" : "RESOURCE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "B6e67bfdA2164168A16e",
-        "lastUpdateDate" : 1554244588651,
+        "systemName" : "VcpeVbng2349fd565070",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbng2349fd565070",
+        "uniqueId" : "4cb551e4-9418-4cf5-b34f-6e4badc4d17a",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "2c17b482-3538-4b8b-8abc-0d23cd9434c4",
+        "name" : "vCPE_vbng 2349fd56-5070"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "61c5aa6e-9792-4e0b-a49f",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemu7ec56b6aCe16",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558127765860,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558127838226,
+        "csarUUID" : "70b40dcfd9ee4bde9104f22920716164",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu 7ec56b6a-ce16" ],
+        "highestVersion" : true,
+        "uuid" : "20b36ade-0754-496b-886c-b72e9c4ba4c6",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
         "lastUpdaterUserId" : "cs0008",
-        "csarUUID" : "b5b395e79a3b49e7888c53c9c782db6a",
-        "name" : "b6e67bfd-a216-4168-a16e"
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemu7ec56b6aCe16",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemu7ec56b6ace16",
+        "uniqueId" : "b090d41a-8137-4bb6-a5b6-3389a6e3da65",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "36485632-cf8d-4f92-9c25-62ebb92b914e",
+        "name" : "vCPE_vbrgemu 7ec56b6a-ce16"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "bff20b1e-e262-483f-8731",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnkE725f96cB6fd",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558506116073,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558506160720,
+        "csarUUID" : "53cb04337d78490abb81904d0fe6d11a",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK e725f96c-b6fd" ],
+        "highestVersion" : true,
+        "uuid" : "84e30285-90da-42b4-b7ac-76291d807c7c",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnkE725f96cB6fd",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnke725f96cb6fd",
+        "uniqueId" : "f19540f6-2492-4e90-94d4-03c346faca53",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "5245980d-5e62-4237-a92c-975da9c4ee1f",
+        "name" : "vFWCL_vFWSNK e725f96c-b6fd"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "3f666e55-b897-457b-a9d7",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmuxF81f114e0a14",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558508712983,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558508757099,
+        "csarUUID" : "6e1476114d0c4afa8de342ce8abd97f2",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux f81f114e-0a14" ],
+        "highestVersion" : true,
+        "uuid" : "21a411e6-c4e0-4e3a-8ccf-99c06c5850f7",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmuxF81f114e0a14",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmuxf81f114e0a14",
+        "uniqueId" : "9fb54004-e03a-4bd4-9da4-36830d230ccf",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "66b7b4a4-5dbc-48dd-8313-5b5aae1661f7",
+        "name" : "vCPE_vgmux f81f114e-0a14"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "8e1f8ea7-c286-4ea5-9e92",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnkA881803f071d",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558138296627,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558138374112,
+        "csarUUID" : "616f5b522beb42ffa45e920e3439556c",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK a881803f-071d" ],
+        "highestVersion" : true,
+        "uuid" : "df8ead4e-07da-42d9-8563-9c0a15b0c08a",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnkA881803f071d",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnka881803f071d",
+        "uniqueId" : "b9094db8-1e49-41c3-aaa6-1ef5e4f6b650",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "ef06c989-8261-46a6-95b0-1d2443fcfd68",
+        "name" : "vFWCL_vFWSNK a881803f-071d"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "0433c64c-5975-48b1-b850",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfra7e18137c19cb",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558375345767,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558375433514,
+        "csarUUID" : "26d1deefe46342f4b506c7f0c64336af",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra 7e18137c-19cb" ],
+        "highestVersion" : true,
+        "uuid" : "9ec3c7fe-b550-4be9-b6eb-999318bcd064",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfra7e18137c19cb",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfra7e18137c19cb",
+        "uniqueId" : "f55df340-7c9e-4029-9a4e-d4fd6fc89273",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "ea9681cf-7129-41af-a754-1bd01fe04f58",
+        "name" : "vCPE_infra 7e18137c-19cb"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "af82ff10-8cfc-4485-8e3b",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfra27aa0cce3d4b",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558507199441,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558507254502,
+        "csarUUID" : "13436b4c3a9d4550bcc835d4b2ce1ccf",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra 27aa0cce-3d4b" ],
+        "highestVersion" : true,
+        "uuid" : "57c23d62-a7aa-4197-a774-6d876e092b6f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfra27aa0cce3d4b",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfra27aa0cce3d4b",
+        "uniqueId" : "2c9a0ae9-e378-46d8-a486-9f17f21c597c",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "5ab80de3-447e-47a1-8ac0-bdadd8e4a05d",
+        "name" : "vCPE_infra 27aa0cce-3d4b"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "b256085d-4fa1-416a-a823",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VlbmsCd6a4c8cF1f0",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558125088778,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558125192583,
+        "csarUUID" : "6cef83c53eca4a27bbb9f27572d8b702",
+        "csarVersion" : "1.0",
+        "tags" : [ "vLBMS cd6a4c8c-f1f0" ],
+        "highestVersion" : true,
+        "uuid" : "1a89852a-ffaa-4775-95bb-cb95898f3891",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VlbmsCd6a4c8cF1f0",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbmscd6a4c8cf1f0",
+        "uniqueId" : "1da81212-1f93-4d1e-81c5-59a0fe2e737a",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "8cb623ef-3611-4f08-9992-6d4fbbbd8884",
+        "name" : "vLBMS cd6a4c8c-f1f0"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "0158c0e8-a20d-42f7-8435",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkgF79d6d62D93a",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558043846404,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558043906075,
+        "csarUUID" : "ff6713c5827044f2a5faab5e4fa72d2c",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG f79d6d62-d93a" ],
+        "highestVersion" : true,
+        "uuid" : "2d113985-b1f9-426e-9689-28830c4b53b2",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkgF79d6d62D93a",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkgf79d6d62d93a",
+        "uniqueId" : "b87d846d-fffd-42c2-a1a7-9c6cfc7113be",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "9205cfb0-bb6c-4f1e-890d-5da17333f6f6",
+        "name" : "vFWCL_vPKG f79d6d62-d93a"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "11bfe115-4d37-441e-9af4",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkgCbece137377a",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558506248834,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558506271939,
+        "csarUUID" : "49363e638bee459089a78ee2f16e091b",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG cbece137-377a" ],
+        "highestVersion" : true,
+        "uuid" : "16a10c0f-bfd0-4fcc-8cb6-63b922dbf579",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkgCbece137377a",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkgcbece137377a",
+        "uniqueId" : "df8589e0-1dcd-45dd-9b94-220b65994d72",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "9cb82d1c-7b53-4645-a13c-c3d0bb1bb850",
+        "name" : "vFWCL_vPKG cbece137-377a"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "58ed3888-f0cb-4b7b-9ef0",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgw74fc7c385ab2",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558049165989,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558049245368,
+        "csarUUID" : "437da74fd6bd4c39850b8ab7c0396b4f",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw 74fc7c38-5ab2" ],
+        "highestVersion" : true,
+        "uuid" : "5fc57a11-f5b8-4804-90e7-c32e17ead067",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgw74fc7c385ab2",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgw74fc7c385ab2",
+        "uniqueId" : "58118b10-f578-4e73-9b15-b994f345eea6",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "21eb1e2a-1a79-436f-88a2-fa12d599bfc6",
+        "name" : "vCPE_vgw 74fc7c38-5ab2"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "hpa-vendor-0",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.HpaVf0",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558391506611,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "hpa-vf",
+        "lastUpdateDate" : 1558391660048,
+        "csarUUID" : "eed55a375e7b4dd0b48d6c3d2e18f5c3",
+        "csarVersion" : "1.0",
+        "tags" : [ "hpa-vf-0" ],
+        "highestVersion" : true,
+        "uuid" : "ce020d24-6b7f-49ff-b68f-2f9d4ff0a29b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "HpaVf0",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "hpavf0",
+        "uniqueId" : "6d1617c2-d049-4798-846a-caf3ce5def74",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "af2b6dd5-f5bc-4ef7-8177-6de0b15084d1",
+        "name" : "hpa-vf-0"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "b2d0e609-a3d5-4716-bd72",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgw519bf0f17d2a",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558018299574,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558018344124,
+        "csarUUID" : "4060e827472c4c9fbc9dcc20fc0e23ad",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw 519bf0f1-7d2a" ],
+        "highestVersion" : true,
+        "uuid" : "e14f8152-49bb-48a0-abfd-39c229861e7d",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgw519bf0f17d2a",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgw519bf0f17d2a",
+        "uniqueId" : "ecb0254c-7322-40fb-a3bd-84d462231f98",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "defcd36c-7523-4cbd-9135-c19167cb4343",
+        "name" : "vCPE_vgw 519bf0f1-7d2a"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "76792382-0821-443c-9a1d",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmuxD8960be96b31",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558017473547,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558017533989,
+        "csarUUID" : "b5b2cdca10a8483d962892aea81404f9",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux d8960be9-6b31" ],
+        "highestVersion" : true,
+        "uuid" : "2ef9f9f9-7b95-427e-8529-8a5ab4684e9f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmuxD8960be96b31",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmuxd8960be96b31",
+        "uniqueId" : "bb4100ed-2cf8-424c-9142-adab283de1a8",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "23d9ed17-0adf-4445-90e1-546dee6ac708",
+        "name" : "vCPE_vgmux d8960be9-6b31"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "9e557317-41a0-4859-8262",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemu3a011d5bE7de",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558142040354,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558142099597,
+        "csarUUID" : "cb4a12b1f4be41e1815e6478db469940",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu 3a011d5b-e7de" ],
+        "highestVersion" : true,
+        "uuid" : "67522bb0-c072-41ed-874a-c0fd1d161d86",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemu3a011d5bE7de",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemu3a011d5be7de",
+        "uniqueId" : "eee365b9-795b-4e32-a309-d3a1efc3b0b4",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "60dbaaa7-634e-4dc9-9486-d6609342f5b3",
+        "name" : "vCPE_vbrgemu 3a011d5b-e7de"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "d84a9515-47bb-4f0e-bbbe",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemu13c0abdaD69f",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558376505430,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558376558879,
+        "csarUUID" : "178ace2aba6a41c1a5fc8066a93f9654",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu 13c0abda-d69f" ],
+        "highestVersion" : true,
+        "uuid" : "154d95d6-fb31-4905-832f-8a9e1bf28d9d",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemu13c0abdaD69f",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemu13c0abdad69f",
+        "uniqueId" : "cc69efaf-f7b3-4cb0-b7eb-89093866cce9",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "a68126bc-c8e6-4de8-921d-1af82bee7315",
+        "name" : "vCPE_vbrgemu 13c0abda-d69f"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "ae9ffdc1-ba02-47dd-a5dd",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfraB10cb839455f",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558045797347,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558045917932,
+        "csarUUID" : "86991455d8d14f66a5540c5d615e863b",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra b10cb839-455f" ],
+        "highestVersion" : true,
+        "uuid" : "09dc9d75-7e31-4711-98ba-5cb65f790a94",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfraB10cb839455f",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfrab10cb839455f",
+        "uniqueId" : "5498bb77-6bfc-4303-af88-def288c4326d",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "31f8466f-4c92-4eb1-ae38-cb4d90dd3fed",
+        "name" : "vCPE_infra b10cb839-455f"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "350bef78-9e44-4a53-b67d",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgwA394819a028b",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558509236652,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558509266246,
+        "csarUUID" : "ee33a7c2f6a541a698bbebb7770fb50a",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw a394819a-028b" ],
+        "highestVersion" : true,
+        "uuid" : "e4b0d218-9586-4f50-b6f9-a568deace917",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgwA394819a028b",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgwa394819a028b",
+        "uniqueId" : "3203ef51-4067-44ae-b6a7-3e3c525be1a7",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "45233ba0-614e-4998-a0a6-67ab748d7062",
+        "name" : "vCPE_vgw a394819a-028b"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "38188898-3193-42af-bea6",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemuDd5e280bEda5",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558016675872,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558016739824,
+        "csarUUID" : "76dd45b555a24f8ea84fff1bbab7c725",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu dd5e280b-eda5" ],
+        "highestVersion" : true,
+        "uuid" : "0f651565-7b51-4959-9b99-bc1b1d0d7233",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemuDd5e280bEda5",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemudd5e280beda5",
+        "uniqueId" : "ac1dfd76-b18d-4e63-a18a-1d8f653b6f6d",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "7088811b-0bda-429f-b17c-719cdce38e6f",
+        "name" : "vCPE_vbrgemu dd5e280b-eda5"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "11092a36-ce8d-4eb7-af00",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfra8ed3b7a8473c",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558140262794,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558140352184,
+        "csarUUID" : "de73c6e857e64e7eb873f49a019e881a",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra 8ed3b7a8-473c" ],
+        "highestVersion" : true,
+        "uuid" : "510c3d7f-ccf1-4f0e-8628-0d0dc0535258",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfra8ed3b7a8473c",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfra8ed3b7a8473c",
+        "uniqueId" : "752abf91-6b69-46fe-96fb-14c46dc1b504",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "eed2d18c-9ae2-422e-aab3-59a70f010a1e",
+        "name" : "vCPE_infra 8ed3b7a8-473c"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "fa47a9c2-5b91-42bd-a9fa",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkg6d26f94531c6",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558374055188,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558374097685,
+        "csarUUID" : "c0adccf802a44358a9f8452668adff9d",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG 6d26f945-31c6" ],
+        "highestVersion" : true,
+        "uuid" : "89b0bf5a-b3db-468c-8ba5-dcfc0faa6856",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkg6d26f94531c6",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkg6d26f94531c6",
+        "uniqueId" : "c2137cff-4bf6-4cdf-98e3-2fa38a0f0df2",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "d1cb844a-3764-4805-95e1-4c838b16088f",
+        "name" : "vFWCL_vPKG 6d26f945-31c6"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "1e877008-572f-4ed2-9f9e",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfra9c662ac221e2",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558126020300,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558126137764,
+        "csarUUID" : "5a57374edbcc475a91b4f47a98f35a8e",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra 9c662ac2-21e2" ],
+        "highestVersion" : true,
+        "uuid" : "1ddd6101-a1c8-4d17-a301-dfcdd4b4ea5c",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfra9c662ac221e2",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfra9c662ac221e2",
+        "uniqueId" : "33deedf6-0f67-4935-b716-bf3fc05daa1d",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "a407cf64-99f2-47c0-8055-a7b938ff43ec",
+        "name" : "vCPE_infra 9c662ac2-21e2"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "837fe1e2-dc5e-4549-8509",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnkC09b1f4c2f38",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558373890249,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558373952539,
+        "csarUUID" : "3fa52f1a1ba9437a89e1f1c4df089fac",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK c09b1f4c-2f38" ],
+        "highestVersion" : true,
+        "uuid" : "a93ad567-20eb-4165-aacb-01b7978b56fb",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnkC09b1f4c2f38",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnkc09b1f4c2f38",
+        "uniqueId" : "8c243748-75a7-4973-b67f-9123b730f6a8",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "3a161be1-5e8c-4081-b50f-ce2e03141574",
+        "name" : "vFWCL_vFWSNK c09b1f4c-2f38"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "406fa72a-f42a-499c-bbbe",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vfw36a04d849311",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558129531552,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558129669823,
+        "csarUUID" : "6bc0845bb550489faf2435031c2c424a",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFW 36a04d84-9311" ],
+        "highestVersion" : true,
+        "uuid" : "da98bbf0-c010-4cae-90f0-72952cf4bbc0",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vfw36a04d849311",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfw36a04d849311",
+        "uniqueId" : "4d7f6edf-19f3-48e5-864b-7fd9eb980a2a",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "c0c86228-ef26-433c-94da-f31470f4389d",
+        "name" : "vFW 36a04d84-9311"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "453fb743-b91e-4fac-a991",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmuxD3f780f830dd",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558142751205,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558142828753,
+        "csarUUID" : "08e7c78cabe748cb886f5781e48dc908",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux d3f780f8-30dd" ],
+        "highestVersion" : true,
+        "uuid" : "19e9b0f7-9ac8-43d2-b08e-753783593b1b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmuxD3f780f830dd",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmuxd3f780f830dd",
+        "uniqueId" : "a583250d-dd52-4d27-a3b1-ee8e5f1b2ae4",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "697b0aa1-7456-4b20-bfb9-fe8882f7e0f4",
+        "name" : "vCPE_vgmux d3f780f8-30dd"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L2-3",
+          "normalizedName" : "network l2-3",
+          "uniqueId" : "resourceNewCategory.network l2-3",
+          "subcategories" : [ {
+            "name" : "Infrastructure",
+            "normalizedName" : "infrastructure",
+            "uniqueId" : "resourceNewCategory.network l2-3.infrastructure",
+            "icons" : [ "ucpe" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "0158c0e8-a20d-42f7-8435",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Dummyk8s",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558392873822,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "package with k8s charts artifact",
+        "lastUpdateDate" : 1558392964843,
+        "csarUUID" : "ae26a2eb9d2447fda49ad5ad4f360061",
+        "csarVersion" : "1.0",
+        "tags" : [ "dummyk8s" ],
+        "highestVersion" : true,
+        "uuid" : "42ad5bf9-116c-43a8-8917-ffefad0ac193",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Dummyk8s",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "dummyk8s",
+        "uniqueId" : "99d3ac0e-b59d-4e7a-9a0e-160f9b651aa3",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "b1f098fa-bcbf-45b3-9a9b-f56c8515108b",
+        "name" : "dummyk8s"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "632ae13b-47d4-4623-b0dc",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbng4feeba1cC4b2",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558126939744,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558126993690,
+        "csarUUID" : "c3a7a008629e4532a1552bac5f406a03",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng 4feeba1c-c4b2" ],
+        "highestVersion" : true,
+        "uuid" : "8469fda0-7340-469d-a49a-cea807ea5b68",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbng4feeba1cC4b2",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbng4feeba1cc4b2",
+        "uniqueId" : "31dc841b-14ae-4f2c-9a16-125f4520750d",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "dbc4a985-834a-4b6a-a856-f22545fe0f46",
+        "name" : "vCPE_vbng 4feeba1c-c4b2"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "98bd5aa0-2d93-452a-a9fc",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbngB0303599703a",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558507775902,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558507802221,
+        "csarUUID" : "9202603b53d54f6d92903d4da2c4c1d9",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng b0303599-703a" ],
+        "highestVersion" : true,
+        "uuid" : "3650ee79-fe26-40ab-a5f0-89a34fa11a24",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbngB0303599703a",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbngb0303599703a",
+        "uniqueId" : "ba9ed798-2054-4c4b-b7da-abb9ae4c75dc",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "cd34485f-d102-46ac-b0b2-e35505287e04",
+        "name" : "vCPE_vbng b0303599-703a"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "97ab60bd-6dd7-4db5-a87b",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeInfra4637f99e8433",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558014946170,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558015086793,
+        "csarUUID" : "6bfd763ef1324bbead9e3ce66b9c8323",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_infra 4637f99e-8433" ],
+        "highestVersion" : true,
+        "uuid" : "4474e0ed-c50b-470a-add6-846630ae7423",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeInfra4637f99e8433",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpeinfra4637f99e8433",
+        "uniqueId" : "4ba98ce5-59bf-40a4-86a4-ef764ed718ed",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "21a57f33-15e2-4d3e-966d-726d1a4f26fd",
+        "name" : "vCPE_infra 4637f99e-8433"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "1c75e219-0e34-4302-afd2",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkgDeabfc5e8946",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558124152470,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558124221520,
+        "csarUUID" : "02e50c896d3048b8915783df00656889",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG deabfc5e-8946" ],
+        "highestVersion" : true,
+        "uuid" : "e4a87ae2-c8dd-474a-b1dc-b37822163ccc",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkgDeabfc5e8946",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkgdeabfc5e8946",
+        "uniqueId" : "e4b6e454-7d30-494f-bce0-654f46facf1c",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "cea1287c-7524-47e9-b833-8d5f34ba1706",
+        "name" : "vFWCL_vPKG deabfc5e-8946"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "fc1fdd94-d4f2-403b-a0f8",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnk154f001cE21e",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558123919478,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558124010971,
+        "csarUUID" : "7910c4de21ed4c98807ea762fa363686",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK 154f001c-e21e" ],
+        "highestVersion" : true,
+        "uuid" : "ce931ba9-5aef-4ee7-ab35-e248c0e23323",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnk154f001cE21e",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnk154f001ce21e",
+        "uniqueId" : "e4be6a6f-22b9-4cd0-878d-5fe8ad0ab2f0",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "6e06632a-3742-420c-a153-421fb3dcf414",
+        "name" : "vFWCL_vFWSNK 154f001c-e21e"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "584c74cd-e30e-4d65-b658",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vlbms767fef9470d4",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558139377209,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558139478586,
+        "csarUUID" : "a997bed375ba468180d3b33842085517",
+        "csarVersion" : "1.0",
+        "tags" : [ "vLBMS 767fef94-70d4" ],
+        "highestVersion" : true,
+        "uuid" : "385d9a40-9c68-4fff-9efc-4a9f93b2488b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vlbms767fef9470d4",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbms767fef9470d4",
+        "uniqueId" : "8fc61586-986b-4dcd-9fb5-07c413569a21",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "d88eb7bd-1bd6-408b-a62c-da9a6f6eb9a5",
+        "name" : "vLBMS 767fef94-70d4"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "0db8710d-d593-4f80-b58f",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVfwsnk487d3f8c9021",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558013021077,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558013102007,
+        "csarUUID" : "8d1b74b4b467443b82057e2f577f0b20",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vFWSNK 487d3f8c-9021" ],
+        "highestVersion" : true,
+        "uuid" : "0be0280e-39e3-4284-8907-fc1233590d3b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVfwsnk487d3f8c9021",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvfwsnk487d3f8c9021",
+        "uniqueId" : "fb9541c3-37c3-48d6-bf69-30982920ab46",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "37520a24-37ae-45f4-b883-299361224161",
+        "name" : "vFWCL_vFWSNK 487d3f8c-9021"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "f95f3f50-a0ea-4080-8ce9",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwclVpkgF8d882e3Da13",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558138556330,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558138621107,
+        "csarUUID" : "0da3843fb2ec492d977db6fdb0d1b452",
+        "csarVersion" : "1.0",
+        "tags" : [ "vFWCL_vPKG f8d882e3-da13" ],
+        "highestVersion" : true,
+        "uuid" : "7353fab9-c23e-40ed-8095-63b5a77e9ede",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwclVpkgF8d882e3Da13",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfwclvpkgf8d882e3da13",
+        "uniqueId" : "663061bd-fdaa-4143-b327-f504df52f6dc",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "6ae399a2-01cd-4e5a-947d-42e4c7f53e18",
+        "name" : "vFWCL_vPKG f8d882e3-da13"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "59a0990b-606e-4394-a303",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbrgemuAe065dc6330b",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558047535262,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558047598462,
+        "csarUUID" : "411b7636a57d4da8949c7de183cb4b14",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbrgemu ae065dc6-330b" ],
+        "highestVersion" : true,
+        "uuid" : "94fb6676-e418-4762-9533-87754d760d19",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbrgemuAe065dc6330b",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevbrgemuae065dc6330b",
+        "uniqueId" : "ff405a7b-4ada-4b39-bdfc-902e9593d486",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "14351340-6c63-47c6-ae6f-c190d21d9718",
+        "name" : "vCPE_vbrgemu ae065dc6-330b"
       }, {
         "artifacts" : { },
         "deploymentArtifacts" : { },
@@ -94,41 +2647,448 @@
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
         "interfaces" : { },
-        "vendorName" : "vfw-hpa-demo",
+        "vendorName" : "onap",
         "vendorRelease" : "1.0",
         "resourceVendorModelNumber" : "",
-        "toscaResourceName" : "org.openecomp.resource.vf.VfwHpaSriovV2",
+        "toscaResourceName" : "org.openecomp.resource.vf.Ipsec",
+        "resourceType" : "VF",
         "abstract" : false,
+        "version" : "2.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558322945245,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "test ipsec 1",
+        "lastUpdateDate" : 1558328115387,
+        "csarUUID" : "44e6977fd1994bb3a9ac3025650e861e",
+        "csarVersion" : "1.0",
+        "tags" : [ "ipsec" ],
+        "highestVersion" : true,
+        "uuid" : "dce39549-1425-4904-8a52-81ede715e98f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ipsec",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "ipsec",
+        "uniqueId" : "7574cb91-b9cc-4242-952a-f56ce0e39b27",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "dc1845f1-83c0-4c56-a997-da4abce312c0",
+        "name" : "ipsec"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "b784668e-1132-4710-919a",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.Vlbms27373bbaA5b6",
         "resourceType" : "VF",
+        "abstract" : false,
         "version" : "1.0",
-        "tags" : [ "vfw-hpa-sriov_v2" ],
-        "description" : "vfw hpa",
-        "creationDate" : 1554412673495,
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558506706512,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558506764805,
+        "csarUUID" : "50e117782d1d49259bb49debbab6c246",
         "csarVersion" : "1.0",
+        "tags" : [ "vLBMS 27373bba-a5b6" ],
+        "highestVersion" : true,
+        "uuid" : "007ac810-2f4d-4f98-8670-298501e7c6d8",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vlbms27373bbaA5b6",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbms27373bbaa5b6",
+        "uniqueId" : "236479dd-117f-475a-b2a8-1bc222e877cb",
+        "allArtifacts" : { },
         "archived" : false,
         "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "5ceeba9d-d5b0-4b19-acf6-d6f63ccc85a9",
+        "name" : "vLBMS 27373bba-a5b6"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "98949173-6d7e-4e99-b0c7",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgwA69754a4B95b",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558143538723,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558143592691,
+        "csarUUID" : "19cb5e501a5642918509537be32d5933",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw a69754a4-b95b" ],
         "highestVersion" : true,
-        "uniqueId" : "143748d8-a6e4-4be9-94c2-6138a9444490",
+        "uuid" : "da4b9fd2-fc27-431d-beea-4c9f2aba2d44",
         "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgwA69754a4B95b",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgwa69754a4b95b",
+        "uniqueId" : "2aeacb49-7b6d-44ad-8900-fb81d4c9f699",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "b08e0014-858b-4eb3-a707-75e0f1ffffb9",
+        "name" : "vCPE_vgw a69754a4-b95b"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "23c0e760-fa28-4588-bb2e",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVbngE3ef4691F6f7",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558141178856,
         "lastUpdaterFullName" : "Carlos Santana",
-        "normalizedName" : "vfwhpasriovv2",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558141243700,
+        "csarUUID" : "2ba4e8b35ecb4d8d81b55a8b20b5dc18",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vbng e3ef4691-f6f7" ],
+        "highestVersion" : true,
+        "uuid" : "2e2c8636-c934-4b31-ba66-82e3cb1b0b86",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
         "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVbngE3ef4691F6f7",
         "actualComponentType" : "VF",
         "topologyTemplate" : true,
+        "normalizedName" : "vcpevbnge3ef4691f6f7",
+        "uniqueId" : "3cb62dea-72e6-4a0b-943b-a68a654185ee",
         "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
         "icon" : "defaulticon",
-        "invariantUUID" : "b7d993a3-3870-4096-a16c-90110d402349",
-        "uuid" : "04ffd583-5625-4471-b20b-38394b513efd",
+        "invariantUUID" : "bded5412-96a6-49a5-9a5c-74da3addb1be",
+        "name" : "vCPE_vbng e3ef4691-f6f7"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "7ea309f6-4592-426b-8540",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmuxF4f5938c89be",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558048340078,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558048395850,
+        "csarUUID" : "8b46d9c5f5b24a5994f879740e4f5256",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux f4f5938c-89be" ],
+        "highestVersion" : true,
+        "uuid" : "3b6cf88a-aab1-4554-9237-8cf823e4d227",
+        "contactId" : "cs0008",
         "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmuxF4f5938c89be",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmuxf4f5938c89be",
+        "uniqueId" : "6995c3f2-bb96-4f9a-aa37-2ed0485a7038",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "b1d72e97-e487-4796-a1f4-648e989e9d89",
+        "name" : "vCPE_vgmux f4f5938c-89be"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "2a859fba-5f3c-4613-b798",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgwB455df6eF474",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
         "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558129351372,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558129414744,
+        "csarUUID" : "b70789f01d5d4769a6ed6623059c6092",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgw b455df6e-f474" ],
+        "highestVersion" : true,
+        "uuid" : "b8de1827-b6b0-4ea4-866f-3152775b94ee",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
         "componentType" : "RESOURCE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwHpaSriovV2",
-        "lastUpdateDate" : 1554412686835,
+        "systemName" : "VcpeVgwB455df6eF474",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgwb455df6ef474",
+        "uniqueId" : "16a4db57-98b5-44d6-a5d9-0a2378d1d372",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "5ed20589-e18b-4d73-bf60-9cb5f92740f4",
+        "name" : "vCPE_vgw b455df6e-f474"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "aa34c223-6996-4e19-85e8",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VlbmsA40a45cc8623",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558014113127,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558014214025,
+        "csarUUID" : "9ff0441eee2e4cd1888fbdcc7ffd7146",
+        "csarVersion" : "1.0",
+        "tags" : [ "vLBMS a40a45cc-8623" ],
+        "highestVersion" : true,
+        "uuid" : "f9d16bbd-ab7d-4c3a-944f-bb15418b8334",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
         "lastUpdaterUserId" : "cs0008",
-        "csarUUID" : "13a62878030c464095d2727381299565",
-        "name" : "vfw-hpa-sriov_v2"
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VlbmsA40a45cc8623",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vlbmsa40a45cc8623",
+        "uniqueId" : "b4bde455-3c32-4468-ad61-05c5354776b0",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "c39b8774-6891-4402-9e1b-7898ccb46813",
+        "name" : "vLBMS a40a45cc-8623"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "vendorName" : "26e69b07-cca6-48da-b948",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VcpeVgmux3dc589241a3d",
+        "resourceType" : "VF",
+        "abstract" : false,
+        "version" : "1.0",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558128532052,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "vendor software product",
+        "lastUpdateDate" : 1558128592629,
+        "csarUUID" : "81d0f1ee462a4afd9afadae6cc50650b",
+        "csarVersion" : "1.0",
+        "tags" : [ "vCPE_vgmux 3dc58924-1a3d" ],
+        "highestVersion" : true,
+        "uuid" : "7e15be14-4544-4a93-8ff4-2ba6efbccdde",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VcpeVgmux3dc589241a3d",
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "normalizedName" : "vcpevgmux3dc589241a3d",
+        "uniqueId" : "448289dc-6d39-4f15-8488-6a78aff39a2b",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "1c8bd9bd-a2ff-4f51-9365-ddea82aaa004",
+        "name" : "vCPE_vgmux 3dc58924-1a3d"
       } ],
       "services" : [ {
         "artifacts" : { },
@@ -145,44 +3105,1989 @@
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
         "interfaces" : { },
         "serviceApiArtifacts" : { },
         "forwardingPaths" : { },
-        "projectCode" : "000000",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558129174455,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558508305134,
+        "tags" : [ "robot-ete", "ewm2VCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "375adffd-b8cf-4731-95fe-4b092a9729d3",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vcpevgw",
+        "uniqueId" : "5d1b0933-02bf-49b5-a510-605851a85b01",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "b1da2b57-0214-45ea-9501-fd19e64e5e91",
+        "name" : "ewm2VCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558013945546,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558042231647,
+        "tags" : [ "robot-ete", "demoVLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "a48f0678-23e3-484d-800c-2f507b4e1cba",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovlb",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovlb",
+        "uniqueId" : "5ea1d119-ebd7-414b-91c8-062072d8796f",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "3c3ef9e9-f574-42f6-af29-440b0c54ca1a",
+        "name" : "demoVLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "E2E Service",
+          "normalizedName" : "e2e service",
+          "uniqueId" : "serviceNewCategory.e2e service",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "00001",
+        "version" : "0.1",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558328602556,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "ipsec test",
+        "lastUpdateDate" : 1558328952551,
+        "tags" : [ "ipsec" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "ce28c3cc-a123-4d9e-b785-b6ea8aa657d0",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "READY_FOR_CERTIFICATION",
+        "systemName" : "Ipsec",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ipsec",
+        "uniqueId" : "951a0671-351c-4756-a907-6200b7e12928",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "4c36e4c1-507a-4257-ad35-825916d52d5f",
+        "name" : "ipsec"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558043350406,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558044094133,
+        "tags" : [ "robot-ete", "ewm1VFWCL" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "5ffdc6d8-fb5b-4463-aa11-9f2736c23c45",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vfwcl",
+        "uniqueId" : "be25a232-661b-4b26-a689-172197ac365d",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "356d0f0b-227f-46c0-a9f4-c67fc7ffdbcd",
+        "name" : "ewm1VFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558048157036,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558048567174,
+        "tags" : [ "robot-ete", "ewm1VCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "e08e76c3-db71-49a6-b350-727f95fe2e43",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vcpevgmux",
+        "uniqueId" : "de91ff3e-4af5-47cd-aadc-7797badf996f",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "56638f44-c0e6-4808-a209-ef037cf81125",
+        "name" : "ewm1VCPEvGMUX"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558129378074,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558129819181,
+        "tags" : [ "robot-ete", "vFW 2019-05-17 21:42:55" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "b33c711f-d53b-48d2-baa1-178c101431b0",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vfw2019051721:42:55",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfw2019051721:42:55",
+        "uniqueId" : "09c3b17e-eb58-4234-93af-7e3d54b8d98e",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "804a5361-8a29-4db2-bff5-46ef38eec0ab",
+        "name" : "vFW 2019-05-17 21:42:55"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558506013803,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558506390022,
+        "tags" : [ "robot-ete", "ewm5VFWCL" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "eac1f64f-c1c0-412e-92a4-5bcd52f88023",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vfwcl",
+        "uniqueId" : "494da39c-453d-4561-ac6a-3c837bc44f60",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "23a54951-5a17-46d9-94c6-56a30c8f9e5e",
+        "name" : "ewm5VFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558014790437,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558075714606,
+        "tags" : [ "robot-ete", "demoVCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "18a8b0f8-2357-4b68-a7a9-2b0eb6def241",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovcpeinfra",
+        "uniqueId" : "b8d7ce7c-b405-4d5f-9bb7-37eedf42a016",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "78484782-b5e9-402f-ba74-1ae48e0a6459",
+        "name" : "demoVCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558012762904,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558013500919,
+        "tags" : [ "robot-ete", "demoVFWCL" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "fb482077-f314-4fd4-8678-195e909e4e82",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovfwcl",
+        "uniqueId" : "64bda7d8-db4d-4a45-9365-43df72b5b9ef",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "564da977-8372-4e9b-acd4-f10938e5fe39",
+        "name" : "demoVFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558123723867,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558124413976,
+        "tags" : [ "robot-ete", "ewm2VFWCL" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "bb515b6b-b665-49e3-93f4-811a949fccfc",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vfwcl",
+        "uniqueId" : "dfa212ad-a345-4d35-bab8-3bcc44a18e8a",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "e1211cea-52d5-4ee1-8fc4-c193e2fd2dec",
+        "name" : "ewm2VFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558374509203,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558374867479,
+        "tags" : [ "robot-ete", "ewm4VLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "76d2ecf2-0233-49fc-a7a4-b55f5fdbc665",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vlb",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vlb",
+        "uniqueId" : "15192830-0376-46c4-8773-85e3084fc63e",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "4e6487ac-9e1c-4a3d-a623-5d12d6e82ab7",
+        "name" : "ewm4VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558376791059,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558377059675,
+        "tags" : [ "robot-ete", "ewm4VCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "7e3dcbe7-d96f-4ffc-b02e-7c32e7cd95e7",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vcpevgmux",
+        "uniqueId" : "8b9cbf5c-ce6b-471b-b964-1ccf2bed1e3c",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "f5fa70d5-e8b9-4186-a6f7-3af088ba686a",
+        "name" : "ewm4VCPEvGMUX"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558508632242,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558508850682,
+        "tags" : [ "robot-ete", "ewm5VCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "8250f14f-705a-499a-b4fd-f3b0002a3bc4",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vcpevgmux",
+        "uniqueId" : "b4fc76fc-8b70-43b5-b073-61b704d4f381",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "5595b1b0-f2ce-4037-841f-73d9b9deb9a3",
+        "name" : "ewm5VCPEvGMUX"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "00001",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558330112261,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "ipsec-test",
+        "lastUpdateDate" : 1558331038182,
+        "tags" : [ "ipsec-test" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "c2dbba34-525e-4a6b-b416-006f033251b4",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "IpsecTest",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ipsectest",
+        "uniqueId" : "ad6b6a0d-559c-43be-87e6-1e315d87f448",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "0c38bad3-a4a5-4f7a-8781-5c8c857023d1",
+        "name" : "ipsec-test"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558375833681,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558376125864,
+        "tags" : [ "robot-ete", "ewm4VCPEvBNG" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "4a1fa9f5-2b37-4488-9517-097aa2f306ee",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vcpevbng",
+        "uniqueId" : "0e7d5bb4-cb9d-4712-b6ac-9fe56e127ccf",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "1cb6dee3-f229-42e0-ab12-ad697bab69ab",
+        "name" : "ewm4VCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558507076722,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558507405779,
+        "tags" : [ "robot-ete", "ewm5VCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "28953bf9-4ea0-4c0f-9673-62fe6f8d7401",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vcpeinfra",
+        "uniqueId" : "69023234-019a-436c-b488-05fd63b84f00",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "672b8969-90ff-4163-a1ce-c3046adaefd4",
+        "name" : "ewm5VCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558375140511,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558375605186,
+        "tags" : [ "robot-ete", "ewm4VCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "e1bdbd7c-df1f-49af-a95b-37ee78da5853",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vcpeinfra",
+        "uniqueId" : "d9da9bbb-ed3d-4e0c-8cc2-015bbff662b0",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "110297ff-24ff-4ea9-b8e1-e3b22c499b3c",
+        "name" : "ewm4VCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558127041907,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558386553004,
+        "tags" : [ "robot-ete", "vFW 2019-05-17 21:03:57" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "5a6be2bc-7a4a-4af4-ba7e-742ff2e9281f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vfw2019051721:03:57",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "vfw2019051721:03:57",
+        "uniqueId" : "7354ef9d-9eeb-4021-bcd1-bb6d5a8b27d5",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "02efe1b0-3674-44a3-b18c-376bfd18ab4a",
+        "name" : "vFW 2019-05-17 21:03:57"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558141851755,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558142212135,
+        "tags" : [ "robot-ete", "ewm3VCPEvBRGEMU" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "64ea7733-d6d3-4e2c-b416-57ee17ef4a6b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vcpevbrgemu",
+        "uniqueId" : "2128dcf5-8c27-49c4-94dc-4039cb49acb7",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "22397b49-4e09-4c40-af38-20ab719cdb36",
+        "name" : "ewm3VCPEvBRGEMU"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558509087654,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558509332057,
+        "tags" : [ "robot-ete", "ewm5VCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "07d5e8be-d3f3-4708-9282-65b741c14e9a",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vcpevgw",
+        "uniqueId" : "daa744e7-504f-42d6-a4da-394c2a2a2d6c",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "23fae8e6-cea4-4cab-8a00-9944cd881bde",
+        "name" : "ewm5VCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558018118319,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558063120642,
+        "tags" : [ "robot-ete", "demoVCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "57858ed6-a702-4824-80d9-98366cb85be5",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovcpevgw",
+        "uniqueId" : "e8b2c103-346a-4b6f-8bed-46af023d848b",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "0421ba67-d531-456b-b313-43c1386a2c67",
+        "name" : "demoVCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558124848379,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558125349868,
+        "tags" : [ "robot-ete", "ewm2VLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "e0839926-3c8d-4e72-adae-7b6c992dd2f5",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vlb",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vlb",
+        "uniqueId" : "fdbcd1cc-b4db-4e2f-8559-4ad9e085c398",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "114e0260-7f1d-4d55-89ca-c672c0ccde47",
+        "name" : "ewm2VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
         "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558044539537,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558045117719,
+        "tags" : [ "robot-ete", "ewm1VLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "f03b0682-fb6b-4ddc-b045-5e5028ad9f55",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vlb",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vlb",
+        "uniqueId" : "34c711ba-f602-4a9a-be32-a28fbe2f8f11",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "551dc400-a82d-4007-aad7-17f1fe18879e",
+        "name" : "ewm1VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
         "serviceType" : "",
         "serviceRole" : "",
         "ecompGeneratedNaming" : true,
         "namingPolicy" : "",
         "instantiationType" : "A-la-carte",
         "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
         "version" : "1.0",
-        "tags" : [ "vfw-demo-service" ],
-        "description" : "vfw demo service",
-        "creationDate" : 1554412767728,
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558508087113,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558508355455,
+        "tags" : [ "robot-ete", "ewm5VCPEvBRGEMU" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "d1438343-5112-4cef-9937-7a49b6a7e524",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vcpevbrgemu",
+        "uniqueId" : "1888e21f-7166-47d4-93fc-55446bce0ef7",
+        "allArtifacts" : { },
         "archived" : false,
         "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "5cc7016c-7c25-4fc7-97cf-4c15af83ff42",
+        "name" : "ewm5VCPEvBRGEMU"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558127632042,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558127966316,
+        "tags" : [ "robot-ete", "ewm2VCPEvBRGEMU" ],
         "highestVersion" : true,
-        "uniqueId" : "7929bce5-5f06-4514-82b2-f33c03e8b2ab",
+        "conformanceLevel" : "9.0",
+        "uuid" : "80589b31-db9b-40de-a5a6-370e41c8f421",
         "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vcpevbrgemu",
+        "uniqueId" : "d0ad9d78-a1eb-4595-9ccf-cdea6f0900d4",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "5ec079fc-f519-46d1-9c95-270955471713",
+        "name" : "ewm2VCPEvBRGEMU"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558140997918,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558141422067,
+        "tags" : [ "robot-ete", "ewm3VCPEvBNG" ],
+        "highestVersion" : true,
         "conformanceLevel" : "9.0",
+        "uuid" : "0b30d12b-f5f7-4c48-bba2-12eda709b298",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vcpevbng",
+        "uniqueId" : "1b26ff1d-0661-4021-b787-5e759378d496",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "83ecb256-9422-4e9b-811f-ecd83f511f31",
+        "name" : "ewm3VCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558140080767,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558140568122,
+        "tags" : [ "robot-ete", "ewm3VCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "23cd7540-d368-4235-9834-b0d9890184f8",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vcpeinfra",
+        "uniqueId" : "447c09ab-152f-4396-857a-e7722600eb0e",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "1aa531ef-200a-4f8d-ae04-2c5d75944d90",
+        "name" : "ewm3VCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "000000",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558393100200,
         "lastUpdaterFullName" : "Joni Mitchell",
-        "normalizedName" : "vfwdemoservice",
+        "description" : "hpa service model",
+        "lastUpdateDate" : 1558393396608,
+        "tags" : [ "vfw-hpa" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "5e00e461-b1a7-460a-a6ce-2f673913ec70",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
         "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwHpa",
         "actualComponentType" : "Service",
         "topologyTemplate" : true,
+        "normalizedName" : "vfwhpa",
+        "uniqueId" : "024b7f7a-3f45-49ef-807f-c3303628c402",
         "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
         "icon" : "defaulticon",
-        "invariantUUID" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
-        "uuid" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+        "invariantUUID" : "1ba03449-4da4-438c-a9d7-84f06f503b16",
+        "name" : "vfw-hpa"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558373748936,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558374222143,
+        "tags" : [ "robot-ete", "ewm4VFWCL" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "03d9fb73-e6f3-4646-abe8-60fbd632e938",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vfwcl",
+        "uniqueId" : "e129d6e4-fe00-4fb4-8d3b-a836bee1079f",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "a3bfc4e3-81d4-4c22-880b-669380ed9262",
+        "name" : "ewm4VFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558142638374,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558142950312,
+        "tags" : [ "robot-ete", "ewm3VCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "3b5dbcb2-9869-4cdf-8644-4782f1c791a4",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vcpevgmux",
+        "uniqueId" : "815be33b-3cec-4796-be26-40ca23e3a1f3",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "03987426-5743-410f-b291-d8d951a1700d",
+        "name" : "ewm3VCPEvGMUX"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558125787044,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558126371700,
+        "tags" : [ "robot-ete", "ewm2VCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "a2401bc4-ceff-4141-99aa-5078053b2e4b",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vcpeinfra",
+        "uniqueId" : "bde10a20-9e99-42cc-b660-4173937c583f",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "2c392cbe-bae8-4b90-8efe-cd1f4387f08c",
+        "name" : "ewm2VCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558393077740,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "sample k8s service",
+        "lastUpdateDate" : 1558497574640,
+        "tags" : [ "dummyk8s" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "846f378b-e032-4ad6-8fba-e9c610229002",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Dummyk8s",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "dummyk8s",
+        "uniqueId" : "ce26ae8a-6147-4fe8-a63e-f27583f2be09",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "defaulticon",
+        "invariantUUID" : "fc1651ad-be35-4f97-926f-47feccee7519",
+        "name" : "dummyk8s"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558507671392,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558507911154,
+        "tags" : [ "robot-ete", "ewm5VCPEvBNG" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "3c543226-90a6-42fe-b861-dd8e57776965",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vcpevbng",
+        "uniqueId" : "eec5a775-7ba3-4809-88e7-ed6586650c87",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "65147187-1bcd-429f-b989-8c4e5648605d",
+        "name" : "ewm5VCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558015739368,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558016111854,
+        "tags" : [ "robot-ete", "demoVCPEvBNG" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "e94eafcb-e870-4cc6-bb44-1671319e512a",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovcpevbng",
+        "uniqueId" : "563469b3-9537-439a-9d99-38b033806687",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "9ff41d4f-1432-4198-a88d-d9852f055356",
+        "name" : "demoVCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558128404421,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558128742947,
+        "tags" : [ "robot-ete", "ewm2VCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "006f22a0-3939-4989-94cd-5c1a24cbe6f5",
+        "contactId" : "cs0008",
         "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm2vcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vcpevgmux",
+        "uniqueId" : "8d8a3b46-af88-400d-aace-e577816bd860",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "f6238e3a-ac38-4b84-9890-bdfe9638282d",
+        "name" : "ewm2VCPEvGMUX"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
         "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558126817436,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558127194399,
+        "tags" : [ "robot-ete", "ewm2VCPEvBNG" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "91b40ff7-53bd-4c16-9d60-9315ec08d1e7",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
         "componentType" : "SERVICE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwDemoService",
-        "lastUpdateDate" : 1554414709904,
+        "systemName" : "Ewm2vcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm2vcpevbng",
+        "uniqueId" : "c4669d15-9ffa-415d-9fea-48d4ed833bf4",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "9d62a181-a8d8-49f9-9c46-674be9a57082",
+        "name" : "ewm2VCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558017298179,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558017687677,
+        "tags" : [ "robot-ete", "demoVCPEvGMUX" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "8b8eb18c-741c-4c12-b9d5-333e96c0343e",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
         "lastUpdaterUserId" : "jm0007",
-        "name" : "vfw-demo-service"
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovcpevgmux",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovcpevgmux",
+        "uniqueId" : "69d4c6c7-f47a-40c5-b9e2-7f301e2424ed",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "be53b876-a480-4c7d-aa04-f7acfc18f743",
+        "name" : "demoVCPEvGMUX"
       }, {
         "artifacts" : { },
         "deploymentArtifacts" : { },
@@ -198,44 +5103,585 @@
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
         "interfaces" : { },
         "serviceApiArtifacts" : { },
         "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
         "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558045562985,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558046160965,
+        "tags" : [ "robot-ete", "ewm1VCPEInfra" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "01d60f80-81b8-47e2-8c50-a2c135347b1c",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vcpeinfra",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vcpeinfra",
+        "uniqueId" : "9d227117-f03e-489f-80e8-49e5952f6258",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "1ee0c615-27d3-4102-96cd-6a3a75f00abc",
+        "name" : "ewm1VCPEInfra"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
         "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "0.1",
+        "creatorFullName" : "Carlos Santana",
+        "creationDate" : 1558377277443,
+        "lastUpdaterFullName" : "Carlos Santana",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558377481671,
+        "tags" : [ "robot-ete", "ewm4VCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "21aaea30-20ee-4021-8520-3413f7494c67",
+        "contactId" : "cs0008",
+        "creatorUserId" : "cs0008",
+        "lastUpdaterUserId" : "cs0008",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKIN",
+        "systemName" : "Ewm4vcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vcpevgw",
+        "uniqueId" : "475a3015-e34f-4e1a-8d63-db7005774a9b",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "59ae4038-f8b1-4852-b03b-6cc561532219",
+        "name" : "ewm4VCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
         "serviceType" : "",
         "serviceRole" : "",
         "ecompGeneratedNaming" : true,
         "namingPolicy" : "",
         "instantiationType" : "A-la-carte",
         "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
         "version" : "1.0",
-        "tags" : [ "robot-ete", "vFW 2019-04-02 22:36:04" ],
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558506591619,
+        "lastUpdaterFullName" : "Joni Mitchell",
         "description" : "catalog service description",
-        "creationDate" : 1554244565488,
+        "lastUpdateDate" : 1558506854644,
+        "tags" : [ "robot-ete", "ewm5VLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "a5e2ab46-3cce-4f96-934f-6d7b4b94a9ca",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm5vlb",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm5vlb",
+        "uniqueId" : "5ca947f2-f1d0-4e61-9cd3-5fa002611da5",
+        "allArtifacts" : { },
         "archived" : false,
         "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "1fd37d83-d4a9-4665-841e-327c338cafe0",
+        "name" : "ewm5VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558046595119,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558046975630,
+        "tags" : [ "robot-ete", "ewm1VCPEvBNG" ],
         "highestVersion" : true,
-        "uniqueId" : "7545af33-5b19-44b9-925f-b7f897e95a9e",
+        "conformanceLevel" : "9.0",
+        "uuid" : "1c57343a-c7d9-41c5-8385-971e0558e1b6",
         "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vcpevbng",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vcpevbng",
+        "uniqueId" : "457f65c8-6b57-4b7b-b7d6-5235d8b9c2aa",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "a6b4f706-4169-4252-9f66-fbdf51332f2b",
+        "name" : "ewm1VCPEvBNG"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558047418267,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558047721872,
+        "tags" : [ "robot-ete", "ewm1VCPEvBRGEMU" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "82a4c5b2-411e-49b2-93fd-17ab5ee57845",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vcpevbrgemu",
+        "uniqueId" : "852fef59-ad10-4ab5-b749-e4707a6e127e",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "c3b730a9-536b-437c-b2e2-e8e40ea8ab0f",
+        "name" : "ewm1VCPEvBRGEMU"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558016549602,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558016857998,
+        "tags" : [ "robot-ete", "demoVCPEvBRGEMU" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "ae433b8a-38e8-4d7e-955a-fc0a8b241cf5",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Demovcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "demovcpevbrgemu",
+        "uniqueId" : "bad723d6-2ab4-45f8-9a41-8f0923f635d0",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "483f66c5-a067-4b18-8e82-9b9c1d51d5c5",
+        "name" : "demoVCPEvBRGEMU"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558138149838,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558138779727,
+        "tags" : [ "robot-ete", "ewm3VFWCL" ],
+        "highestVersion" : true,
         "conformanceLevel" : "9.0",
+        "uuid" : "ae6de63a-be8c-49d0-a029-b71d6e51009f",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vfwcl",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vfwcl",
+        "uniqueId" : "d4c07ce0-360e-4690-956e-6eb8e61727af",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "c397b6b1-53a2-4750-bb04-5f824479706f",
+        "name" : "ewm3VFWCL"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558139213660,
         "lastUpdaterFullName" : "Joni Mitchell",
-        "normalizedName" : "vfw2019040222:36:04",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558139648005,
+        "tags" : [ "robot-ete", "ewm3VLB" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "534068d6-161b-432e-83a1-985b7685ccd7",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
         "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm3vlb",
         "actualComponentType" : "Service",
         "topologyTemplate" : true,
+        "normalizedName" : "ewm3vlb",
+        "uniqueId" : "bffa358e-0d6e-4b75-9b9d-3a6d63bce598",
         "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
         "icon" : "network_l_1-3",
-        "invariantUUID" : "00d2740e-705b-4f90-a1d0-6f61c131d4fc",
-        "uuid" : "e5d812e6-6c6e-45f0-a3a5-e231d2a328be",
+        "invariantUUID" : "c9b51054-6a02-48a2-8588-01473c51bf13",
+        "name" : "ewm3VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558048996042,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558049358990,
+        "tags" : [ "robot-ete", "ewm1VCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "b75b0477-c87a-403f-bd11-f44615963836",
+        "contactId" : "cs0008",
         "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm1vcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm1vcpevgw",
+        "uniqueId" : "21769fd0-90ec-4836-a822-02a122cec7c3",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "dbe48f13-0719-4107-920e-ede704b14913",
+        "name" : "ewm1VCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
         "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558143378468,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558143708598,
+        "tags" : [ "robot-ete", "ewm3VCPEvGW" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "13bd256c-4fdc-45a8-a8d3-4314a72178e2",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
+        "lastUpdaterUserId" : "jm0007",
+        "vspArchived" : false,
         "componentType" : "SERVICE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfw2019040222:36:04",
-        "lastUpdateDate" : 1554244609192,
+        "systemName" : "Ewm3vcpevgw",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm3vcpevgw",
+        "uniqueId" : "4db2e912-737e-43c6-a117-6ee318381ce7",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "4f2db3aa-01bf-4fe1-b61d-1e139cb9d24d",
+        "name" : "ewm3VCPEvGW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3",
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "nodeFilterComponents" : { },
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "environmentContext" : "General_Revenue-Bearing",
+        "projectCode" : "123456",
+        "version" : "1.0",
+        "creatorFullName" : "Joni Mitchell",
+        "creationDate" : 1558376430191,
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "description" : "catalog service description",
+        "lastUpdateDate" : 1558376638810,
+        "tags" : [ "robot-ete", "ewm4VCPEvBRGEMU" ],
+        "highestVersion" : true,
+        "conformanceLevel" : "9.0",
+        "uuid" : "e579bcee-ec0b-4b85-bc2c-2c55f8a109d9",
+        "contactId" : "cs0008",
+        "creatorUserId" : "jm0007",
         "lastUpdaterUserId" : "jm0007",
-        "name" : "vFW 2019-04-02 22:36:04"
+        "vspArchived" : false,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Ewm4vcpevbrgemu",
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "normalizedName" : "ewm4vcpevbrgemu",
+        "uniqueId" : "da00c2fe-ec6b-4c7f-9f8c-7f3372820656",
+        "allArtifacts" : { },
+        "archived" : false,
+        "archiveTime" : 0,
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "19041f00-37c9-4918-bcf4-8442a9879951",
+        "name" : "ewm4VCPEvBRGEMU"
       } ]
     }
   }
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-sample.yaml
index e2fc2964..e588938c 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-sample.yaml
@@ -1,16 +1,107 @@
 open_cli_sample_version: 1.0
-name: -u
+name: -m
 version: onap-dublin
 samples:
   sample1:
-    name: -u
-    input: cs0008 -p demo123456! -m http://192.168.1.147:30205 -s
+    name: -m
+    input: http://10.12.5.23:30205 -u cs0008 -p demo123456! --debug
     moco: get-resource-module-name-moco.json
     output: |
-      +--------------------------+----------------------+
-      |service-model-vsp         |resource-module-name  |
-      +--------------------------+----------------------+
-      |b6e67bfd-a216-4168-a16e   |B6e67bfdA2164168A16e  |
-      +--------------------------+----------------------+
-      |vfw-hpa-sriov_v2          |VfwHpaSriovV2         |
-      +--------------------------+----------------------+
+      |vCPE_vgmux 17b1ee63-ab6f    |VcpeVgmux17b1ee63Ab6f     |
+      +----------------------------+--------------------------+
+      |vFW 0d9bc23e-dd98           |Vfw0d9bc23eDd98           |
+      +----------------------------+--------------------------+
+      |vCPE_vbng 4d9e3f9c-f17c     |VcpeVbng4d9e3f9cF17c      |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG 939507b5-0e51    |VfwclVpkg939507b50e51     |
+      +----------------------------+--------------------------+
+      |vCPE_vgw dec03da1-abb0      |VcpeVgwDec03da1Abb0       |
+      +----------------------------+--------------------------+
+      |vLBMS 5bad2e22-af57         |Vlbms5bad2e22Af57         |
+      +----------------------------+--------------------------+
+      |vCPE_vbng 2349fd56-5070     |VcpeVbng2349fd565070      |
+      +----------------------------+--------------------------+
+      |vCPE_vbrgemu 7ec56b6a-ce16  |VcpeVbrgemu7ec56b6aCe16   |
+      +----------------------------+--------------------------+
+      |vFWCL_vFWSNK e725f96c-b6fd  |VfwclVfwsnkE725f96cB6fd   |
+      +----------------------------+--------------------------+
+      |vCPE_vgmux f81f114e-0a14    |VcpeVgmuxF81f114e0a14     |
+      +----------------------------+--------------------------+
+      |vFWCL_vFWSNK a881803f-071d  |VfwclVfwsnkA881803f071d   |
+      +----------------------------+--------------------------+
+      |vCPE_infra 7e18137c-19cb    |VcpeInfra7e18137c19cb     |
+      +----------------------------+--------------------------+
+      |vCPE_infra 27aa0cce-3d4b    |VcpeInfra27aa0cce3d4b     |
+      +----------------------------+--------------------------+
+      |vLBMS cd6a4c8c-f1f0         |VlbmsCd6a4c8cF1f0         |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG f79d6d62-d93a    |VfwclVpkgF79d6d62D93a     |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG cbece137-377a    |VfwclVpkgCbece137377a     |
+      +----------------------------+--------------------------+
+      |vCPE_vgw 74fc7c38-5ab2      |VcpeVgw74fc7c385ab2       |
+      +----------------------------+--------------------------+
+      |hpa-vf-0                    |HpaVf0                    |
+      +----------------------------+--------------------------+
+      |vCPE_vgw 519bf0f1-7d2a      |VcpeVgw519bf0f17d2a       |
+      +----------------------------+--------------------------+
+      |vCPE_vgmux d8960be9-6b31    |VcpeVgmuxD8960be96b31     |
+      +----------------------------+--------------------------+
+      |vCPE_vbrgemu 3a011d5b-e7de  |VcpeVbrgemu3a011d5bE7de   |
+      +----------------------------+--------------------------+
+      |vCPE_vbrgemu 13c0abda-d69f  |VcpeVbrgemu13c0abdaD69f   |
+      +----------------------------+--------------------------+
+      |vCPE_infra b10cb839-455f    |VcpeInfraB10cb839455f     |
+      +----------------------------+--------------------------+
+      |vCPE_vgw a394819a-028b      |VcpeVgwA394819a028b       |
+      +----------------------------+--------------------------+
+      |vCPE_vbrgemu dd5e280b-eda5  |VcpeVbrgemuDd5e280bEda5   |
+      +----------------------------+--------------------------+
+      |vCPE_infra 8ed3b7a8-473c    |VcpeInfra8ed3b7a8473c     |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG 6d26f945-31c6    |VfwclVpkg6d26f94531c6     |
+      +----------------------------+--------------------------+
+      |vCPE_infra 9c662ac2-21e2    |VcpeInfra9c662ac221e2     |
+      +----------------------------+--------------------------+
+      |vFWCL_vFWSNK c09b1f4c-2f38  |VfwclVfwsnkC09b1f4c2f38   |
+      +----------------------------+--------------------------+
+      |vFW 36a04d84-9311           |Vfw36a04d849311           |
+      +----------------------------+--------------------------+
+      |vCPE_vgmux d3f780f8-30dd    |VcpeVgmuxD3f780f830dd     |
+      +----------------------------+--------------------------+
+      |dummyk8s                    |Dummyk8s                  |
+      +----------------------------+--------------------------+
+      |vCPE_vbng 4feeba1c-c4b2     |VcpeVbng4feeba1cC4b2      |
+      +----------------------------+--------------------------+
+      |vCPE_vbng b0303599-703a     |VcpeVbngB0303599703a      |
+      +----------------------------+--------------------------+
+      |vCPE_infra 4637f99e-8433    |VcpeInfra4637f99e8433     |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG deabfc5e-8946    |VfwclVpkgDeabfc5e8946     |
+      +----------------------------+--------------------------+
+      |vFWCL_vFWSNK 154f001c-e21e  |VfwclVfwsnk154f001cE21e   |
+      +----------------------------+--------------------------+
+      |vLBMS 767fef94-70d4         |Vlbms767fef9470d4         |
+      +----------------------------+--------------------------+
+      |vFWCL_vFWSNK 487d3f8c-9021  |VfwclVfwsnk487d3f8c9021   |
+      +----------------------------+--------------------------+
+      |vFWCL_vPKG f8d882e3-da13    |VfwclVpkgF8d882e3Da13     |
+      +----------------------------+--------------------------+
+      |vCPE_vbrgemu ae065dc6-330b  |VcpeVbrgemuAe065dc6330b   |
+      +----------------------------+--------------------------+
+      |ipsec                       |Ipsec                     |
+      +----------------------------+--------------------------+
+      |vLBMS 27373bba-a5b6         |Vlbms27373bbaA5b6         |
+      +----------------------------+--------------------------+
+      |vCPE_vgw a69754a4-b95b      |VcpeVgwA69754a4B95b       |
+      +----------------------------+--------------------------+
+      |vCPE_vbng e3ef4691-f6f7     |VcpeVbngE3ef4691F6f7      |
+      +----------------------------+--------------------------+
+      |vCPE_vgmux f4f5938c-89be    |VcpeVgmuxF4f5938c89be     |
+      +----------------------------+--------------------------+
+      |vCPE_vgw b455df6e-f474      |VcpeVgwB455df6eF474       |
+      +----------------------------+--------------------------+
+      |vLBMS a40a45cc-8623         |VlbmsA40a45cc8623         |
+      +----------------------------+--------------------------+
+      |vCPE_vgmux 3dc58924-1a3d    |VcpeVgmux3dc589241a3d     |
+      +----------------------------+--------------------------+
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
index 908dd068..addce58d 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
@@ -25,12 +25,12 @@ info:
 results:
   direction: landscape
   attributes:
-    - name: service-model-name
-      description: name of vsp in service model
+    - name: vf-model-name
+      description: name of vf model in service model
       type: string
       scope: short
     - name: resource-module-name
-      description: system name of vsp
+      description: system name of vf-model
       type: string
       scope: short
 
@@ -46,5 +46,5 @@ http:
   success_codes:
     - 200
   result_map:
-    service-model-name: $b{services.[*].name}
-    resource-module-name: $b{services.[*].systemName}
+    vf-model-name: $b{resources.[*].name}
+    resource-module-name: $b{resources.[*].systemName}
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml
deleted file mode 100644
index 5bade839..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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_schema_version: 1.0
-name: service-delete
-
-description: Delete a service instance using SO
-
-info:
-  product: onap-dublin
-  service: so
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: service-id
-    description: unique id for service instance
-    type: string
-    short_option: x
-    long_option: service-instace-id
-    is_optional: false
-  - name: model-invariant-id
-    description: model invariant id for service in SDC catalog
-    type: string
-    short_option: b
-    long_option: model-invariant-id
-    is_optional: false
-  - name: model-uuid
-    description: model uuid for service in SDC catalog
-    type: string
-    short_option: i
-    long_option: model-uuid
-    is_optional: false
-  - name: model-name
-    description: model name available in SDC catalog
-    type: string
-    short_option: e
-    long_option: model-name
-    is_optional: false
-  - name: model-version
-    description: model version of service (eg. 1.0)
-    type: string
-    short_option: g
-    long_option: model-version
-    is_optional: false
-  - name: customer-name
-    description: unique id for customer
-    type: string
-    short_option: c
-    long_option: customer-name
-    is_optional: false
-  - name: cloud-region
-    description: cloud region id
-    type: string
-    short_option: j
-    long_option: cloud-region
-    is_optional: false
-  - name: tenant-id
-    description: tenant id
-    type: string
-    short_option: k
-    long_option: tenant-id
-    is_optional: false
-  - name: requestor-id
-    description: requestor ID
-    type: string
-    short_option: r
-    long_option: requestor-id
-    is_optional: false
-
-http:
-  service:
-    name: so
-    version: v6
-    auth: basic
-    mode: direct
-  request:
-    uri: /onap/so/infra/serviceInstances/v6/${service-id}
-    method: DELETE
-    body: '{
-      "requestDetails":{
-        "modelInfo":{
-          "modelType":"service",
-          "modelInvariantId":"${model-invariant-id}",
-          "modelVersionId":"${model-uuid}",
-          "modelName":"${model-name}",
-          "modelVersion":"${model-version}"
-        },
-        "cloudConfiguration":{
-          "lcpCloudRegionId":"${cloud-region}",
-          "tenantId":"${tenant-id}"
-        },
-        "subscriberInfo":{
-          "globalSubscriberId":"${customer-name}"
-        },
-        "requestInfo":{
-          "requestorId":"${requestor-id}",
-          "source":"CLI"
-        }
-      }
-    }'
-  success_codes:
-    - 202
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml
deleted file mode 100644
index f190f064..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-#  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_schema_version: 1.0
-name: service-show-resource-module-name
-description: Show a resource module name from SO
-
-info:
-  product: onap-dublin
-  service: so
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-- name: service-id
-  description: unique id for service instance
-  type: string
-  short_option: s
-  long_option: service-instace-id
-  is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-  - name: name
-    description: Onap resource module name
-    scope: short
-    type: string
-
-
-http:
-  service:
-    name: so
-    version: v6
-    auth: basic
-    mode: direct
-  request:
-    uri: /onap/so/infra/serviceInstances/v6/${service-id}
-    method: GET
-  success_codes:
-  - 201
-  - 200
-  result_map:
-    name: $b{$.[*].serviceName}
-  sample_response:
-    body: '{
-              "requestReferences":{
-                 "instanceId":"${instance-id}",
-                 "requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0"
-              }
-           }'
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml
deleted file mode 100644
index 81b7fada..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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_schema_version: 1.0
-name: vfmodule-delete
-
-description: delete a VF module (experimental)
-
-info:
-  product: onap-dublin
-  service: so
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vfmodule-id
-    description: VF module Id
-    type: string
-    short_option: x
-    long_option: vfmodule-id
-    is_optional: false
-  - name: service-id
-    description: unique id for service
-    type: string
-    short_option: j
-    long_option: service-id
-    is_optional: false
-  - name: vf-id
-    description: unique id for related VF
-    type: string
-    short_option: y
-    long_option: vf-id
-    is_optional: false
-  - name: vf-model-invariant-id
-    description: vf model invariant id
-    type: string
-    short_option: k
-    long_option: vf-model-invariant-id
-    is_optional: false
-  - name: vfmodule-name
-    description: vfmodule model name
-    type: string
-    short_option: e
-    long_option: vfmodule-name
-    is_optional: false
-  - name: vfmodule-version
-    description: vf module version
-    type: string
-    short_option: g
-    long_option: vfmodule-version
-    is_optional: false
-  - name: cloud-region
-    description: cloud region identifier
-    type: string
-    short_option: l
-    long_option: cloud-region
-    is_optional: false
-  - name: tenant-id
-    description: openstack tenant id
-    type: string
-    long_option: tenant-id
-    short_option: z
-    is_optional: false
-
-http:
-  service:
-    name: so
-    version: v6
-    auth: basic
-    mode: direct
-  request:
-    uri: /onap/so/infra/serviceInstances/v6/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id}
-    method: DELETE
-    body: '{
-              "requestDetails":{
-                 "modelInfo":{
-                    "modelType":"vfModule",
-                    "modelInvariantId":"${vf-model-invariant-id}",
-                    "modelName":"${vfmodule-name}",
-                    "modelVersion":"${vfmodule-version}"
-                 },
-                 "cloudConfiguration":{
-                    "lcpCloudRegionId":"${cloud-region}",
-                    "tenantId":"${tenant-id}"
-                 },
-                 "requestInfo":{
-                    "source":"VID"
-                 }
-              }
-           }'
-
-  success_codes:
-    - 202
-\ No newline at end of file
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml
deleted file mode 100644
index 439dfd57..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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_schema_version: 1.0
-name: vnf-delete
-description: Delete a VNF
-
-info:
-  product: onap-dublin
-  service: so
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-- name: vf-id
-  description: id for vnf
-  type: string
-  short_option: x
-  long_option: vf-id
-  is_optional: false
-- name: service-instance-id
-  description: unique id for service instance
-  type: string
-  short_option: y
-  long_option: service-instance-id
-  is_optional: false
-- name: cloud-region
-  description: Cloud region ID
-  type: string
-  short_option: l
-  long_option: cloud-region
-  is_optional: false
-- name: tenant-id
-  description: openstack tenant id (uuid)
-  type: string
-  short_option: z
-  long_option: tenant-id
-  is_optional: false
-- name: model-invariant-id
-  description: model invariant id for service in SDC catalog
-  type: string
-  short_option: b
-  long_option: model-invariant-id
-  is_optional: false
-- name: model-uuid
-  description: model uuid for service in SDC catalog
-  type: string
-  short_option: c
-  long_option: model-uuid
-  is_optional: false
-- name: model-name
-  description: model name available in SDC catalog
-  type: string
-  short_option: e
-  long_option: model-name
-  is_optional: false
-- name: model-version
-  description: model version of service (eg. 1.0)
-  type: string
-  short_option: g
-  long_option: model-version
-  is_optional: false
-http:
-  service:
-    name: so
-    version: v6
-    auth: basic
-    mode: direct
-  request:
-    uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs/${vf-id}
-    method: DELETE
-    body: '{
-              "requestDetails":{
-                 "modelInfo":{
-                    "modelType":"vnf",
-                    "modelInvariantId":"${model-invariant-id}",
-                    "modelVersionId":"${model-uuid}",
-                    "modelName":"${model-name}",
-                    "modelVersion":"${model-version}"
-                 },
-                 "cloudConfiguration":{
-                    "lcpCloudRegionId":"${cloud-region}",
-                    "tenantId":"${tenant-id}"
-                 },
-                 "requestInfo":{
-                    "source":"VID"
-                 },
-                 "requestParameters":{
-                    "userParams":[
-
-                    ]
-                 }
-              }
-           }'
-  success_codes:
-  - 202
-\ No newline at end of file
author	Itohan <itohan.ukponmwan@intel.com>	2019-05-22 18:07:33 +0000
committer	Itohan <itohan.ukponmwan@intel.com>	2019-05-22 21:09:02 +0000
commit	989678694e5960cb43ea5c0d37052b736b639423 (patch)
tree	40fa29f85bb902390275d8825d8c1410db421efd /products
parent	295dccc79512bbf5737b278d340156e0c81035dd (diff)