Update SDC service model commands

-Fix service-model-list to print out correct uuid
-Add command to print resource module name

Change-Id: Iab57a27d24356f32f2b7345c526201409935b7f6
Issue-ID: CLI-161
Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>

6 files changed, 362 insertions, 2532 deletions

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
new file mode 100644
index 00000000..9efdd734
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-moco.json
@@ -0,0 +1,242 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/sdc2/rest/v1/followed",
+    "headers" : {
+      "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "USER_ID" : "cs0008",
+      "X-TransactionId" : "req-0ff67b63-5fcb-4f84-b8e0-3e103aa239b3",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "resources" : [ {
+        "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",
+        "interfaces" : { },
+        "vendorName" : "ffc7ea3e-5407-44f6-9dcb",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.B6e67bfdA2164168A16e",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "version" : "1.0",
+        "tags" : [ "b6e67bfd-a216-4168-a16e" ],
+        "description" : "vendor software product",
+        "creationDate" : 1554244581380,
+        "csarVersion" : "1.0",
+        "archived" : false,
+        "archiveTime" : 0,
+        "highestVersion" : true,
+        "uniqueId" : "512dd581-fe42-4e82-b08e-13f5ed5ec071",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "normalizedName" : "b6e67bfda2164168a16e",
+        "vspArchived" : false,
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "allArtifacts" : { },
+        "icon" : "defaulticon",
+        "invariantUUID" : "7037ee95-babf-4324-a942-e6cf4a99473b",
+        "uuid" : "de0e7941-a28b-4b07-8ba5-b5eb2a39b476",
+        "creatorUserId" : "cs0008",
+        "creatorFullName" : "Carlos Santana",
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "B6e67bfdA2164168A16e",
+        "lastUpdateDate" : 1554244588651,
+        "lastUpdaterUserId" : "cs0008",
+        "csarUUID" : "b5b395e79a3b49e7888c53c9c782db6a",
+        "name" : "b6e67bfd-a216-4168-a16e"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Application L4+",
+          "normalizedName" : "application l4+",
+          "uniqueId" : "resourceNewCategory.application l4+",
+          "subcategories" : [ {
+            "name" : "Firewall",
+            "normalizedName" : "firewall",
+            "uniqueId" : "resourceNewCategory.application l4+.firewall",
+            "icons" : [ "firewall" ],
+            "empty" : false
+          } ],
+          "empty" : false
+        } ],
+        "componentInstancesRelations" : [ ],
+        "capabilities" : { },
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "interfaces" : { },
+        "vendorName" : "vfw-hpa-demo",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwHpaSriovV2",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "version" : "1.0",
+        "tags" : [ "vfw-hpa-sriov_v2" ],
+        "description" : "vfw hpa",
+        "creationDate" : 1554412673495,
+        "csarVersion" : "1.0",
+        "archived" : false,
+        "archiveTime" : 0,
+        "highestVersion" : true,
+        "uniqueId" : "143748d8-a6e4-4be9-94c2-6138a9444490",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "normalizedName" : "vfwhpasriovv2",
+        "vspArchived" : false,
+        "actualComponentType" : "VF",
+        "topologyTemplate" : true,
+        "allArtifacts" : { },
+        "icon" : "defaulticon",
+        "invariantUUID" : "b7d993a3-3870-4096-a16c-90110d402349",
+        "uuid" : "04ffd583-5625-4471-b20b-38394b513efd",
+        "creatorUserId" : "cs0008",
+        "creatorFullName" : "Carlos Santana",
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwHpaSriovV2",
+        "lastUpdateDate" : 1554412686835,
+        "lastUpdaterUserId" : "cs0008",
+        "csarUUID" : "13a62878030c464095d2727381299565",
+        "name" : "vfw-hpa-sriov_v2"
+      } ],
+      "services" : [ {
+        "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",
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "projectCode" : "000000",
+        "environmentContext" : "General_Revenue-Bearing",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "version" : "1.0",
+        "tags" : [ "vfw-demo-service" ],
+        "description" : "vfw demo service",
+        "creationDate" : 1554412767728,
+        "archived" : false,
+        "archiveTime" : 0,
+        "highestVersion" : true,
+        "uniqueId" : "7929bce5-5f06-4514-82b2-f33c03e8b2ab",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "9.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "normalizedName" : "vfwdemoservice",
+        "vspArchived" : false,
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "allArtifacts" : { },
+        "icon" : "defaulticon",
+        "invariantUUID" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
+        "uuid" : "545bca3c-8cc0-4dac-b464-1720894e0213",
+        "creatorUserId" : "jm0007",
+        "creatorFullName" : "Joni Mitchell",
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "VfwDemoService",
+        "lastUpdateDate" : 1554414709904,
+        "lastUpdaterUserId" : "jm0007",
+        "name" : "vfw-demo-service"
+      }, {
+        "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",
+        "interfaces" : { },
+        "serviceApiArtifacts" : { },
+        "forwardingPaths" : { },
+        "projectCode" : "123456",
+        "environmentContext" : "General_Revenue-Bearing",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "instantiationType" : "A-la-carte",
+        "distributionStatus" : "DISTRIBUTED",
+        "version" : "1.0",
+        "tags" : [ "robot-ete", "vFW 2019-04-02 22:36:04" ],
+        "description" : "catalog service description",
+        "creationDate" : 1554244565488,
+        "archived" : false,
+        "archiveTime" : 0,
+        "highestVersion" : true,
+        "uniqueId" : "7545af33-5b19-44b9-925f-b7f897e95a9e",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "9.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "normalizedName" : "vfw2019040222:36:04",
+        "vspArchived" : false,
+        "actualComponentType" : "Service",
+        "topologyTemplate" : true,
+        "allArtifacts" : { },
+        "icon" : "network_l_1-3",
+        "invariantUUID" : "00d2740e-705b-4f90-a1d0-6f61c131d4fc",
+        "uuid" : "e5d812e6-6c6e-45f0-a3a5-e231d2a328be",
+        "creatorUserId" : "jm0007",
+        "creatorFullName" : "Joni Mitchell",
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "systemName" : "Vfw2019040222:36:04",
+        "lastUpdateDate" : 1554244609192,
+        "lastUpdaterUserId" : "jm0007",
+        "name" : "vFW 2019-04-02 22:36:04"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
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
new file mode 100644
index 00000000..e2fc2964
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/get-resource-module-name-sample.yaml
@@ -0,0 +1,16 @@
+open_cli_sample_version: 1.0
+name: -u
+version: onap-dublin
+samples:
+  sample1:
+    name: -u
+    input: cs0008 -p demo123456! -m http://192.168.1.147:30205 -s
+    moco: get-resource-module-name-moco.json
+    output: |
+      +--------------------------+----------------------+
+      |service-model-vsp         |resource-module-name  |
+      +--------------------------+----------------------+
+      |b6e67bfd-a216-4168-a16e   |B6e67bfdA2164168A16e  |
+      +--------------------------+----------------------+
+      |vfw-hpa-sriov_v2          |VfwHpaSriovV2         |
+      +--------------------------+----------------------+
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-moco.json
index 0736aeeb..8825111f 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-moco.json
@@ -7,7 +7,7 @@
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-daff4f50-d1f0-47d9-a4c2-bd092ddd92ac",
+      "X-TransactionId" : "req-08299aa7-2681-455e-923f-b30a1a02c67f",
       "Content-Type" : "application/json"
     },
     "json" : null
@@ -20,63 +20,6 @@
         "deploymentArtifacts" : { },
         "toscaArtifacts" : { },
         "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.VfwhpaTest1",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548181559443,
-        "version" : "1.0",
-        "description" : "vfwhpa test1",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwhpaTest1",
-        "lastUpdateDate" : 1548181943570,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "vfwhpatest1",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "vfwhpa_test1" ],
-        "uniqueId" : "6c4d01ca-1a21-4d72-b389-d4f11fcae1c2",
-        "uuid" : "53a320ac-0be3-4c72-8ea1-6a7583930259",
-        "csarUUID" : "38a21a8bb73e4107b3b727f08153bce7",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "bc1c9d41-a47f-41ec-b2e0-d0d93ce4a464",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vfwhpa_test1"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
           "name" : "Generic",
           "normalizedName" : "generic",
           "uniqueId" : "resourceNewCategory.generic",
@@ -95,724 +38,40 @@
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
         "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.06357cff760a4c48Aa35",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "3ec04b77-2696-4b6e-92da",
+        "vendorName" : "ffc7ea3e-5407-44f6-9dcb",
         "vendorRelease" : "1.0",
         "resourceVendorModelNumber" : "",
-        "creationDate" : 1548198587569,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "06357cff760a4c48Aa35",
-        "lastUpdateDate" : 1548198635651,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "06357cff760a4c48aa35",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "06357cff-760a-4c48-aa35" ],
-        "uniqueId" : "82aba7c4-eaa7-4cb6-a594-e0b0058500b6",
-        "uuid" : "0b504b8a-68a9-4722-9b33-b8486b6d12e1",
-        "csarUUID" : "978a677077cd4632b6b85820a30a0e91",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "6daf1f0f-b456-478c-9e3d-fb3f915ee4ea",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "06357cff-760a-4c48-aa35"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Load Balancer",
-            "normalizedName" : "load balancer",
-            "uniqueId" : "resourceNewCategory.application l4+.load balancer",
-            "icons" : [ "loadBalancer" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.VlbhpaSriov",
-        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.B6e67bfdA2164168A16e",
         "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548353976470,
-        "version" : "1.0",
-        "description" : "vlbhpa sriov",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VlbhpaSriov",
-        "lastUpdateDate" : 1548354020696,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "vlbhpasriov",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "vlbhpa_sriov" ],
-        "uniqueId" : "aa22303c-fcfd-4475-b6a6-45f4853872f9",
-        "uuid" : "f1eda415-77ac-4ad3-b049-e9e7cd5107bd",
-        "csarUUID" : "9b3ae4aa686c4aa2be524ce6f6c95842",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "2b899e16-5682-4c53-9046-388fe5a15868",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vlbhpa_sriov"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.CliVf3",
         "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "itohan-vendor",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1553125006126,
-        "version" : "1.0",
-        "description" : "cli-vf-3",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "CliVf3",
-        "lastUpdateDate" : 1553125171457,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "clivf3",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "cli-vf-3" ],
-        "uniqueId" : "86e7f0b5-e93f-45d7-b279-6e8d450fb1d9",
-        "uuid" : "1119b3ca-ba88-446e-8812-7fe8f8078aef",
-        "csarUUID" : "b45a4ac88b274c179744e4a2d2d93767",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "d0046ab0-5789-4a97-b61a-2763acddd180",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "cli-vf-3"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.53cfef1877434b35Bd89",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "354c419d-b63b-4ff9-bc03",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547837108958,
         "version" : "1.0",
+        "tags" : [ "b6e67bfd-a216-4168-a16e" ],
         "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "53cfef1877434b35Bd89",
-        "lastUpdateDate" : 1547837129231,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "53cfef1877434b35bd89",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "53cfef18-7743-4b35-bd89" ],
-        "uniqueId" : "8f99feda-1578-4b76-89c9-aced7e6ebf2a",
-        "uuid" : "783d2fb6-8de2-4939-845d-f757d38e08b3",
-        "csarUUID" : "b3b170ffa1e54f6880b61817aebdbdca",
+        "creationDate" : 1554244581380,
         "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "f69f911c-e9c1-410f-92e3-be5c858215a4",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "53cfef18-7743-4b35-bd89"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.VfwhpaSriov",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548270171172,
-        "version" : "1.0",
-        "description" : "vfwhpa sriov",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwhpaSriov",
-        "lastUpdateDate" : 1548270278938,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "vfwhpasriov",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
         "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "vfwhpa_sriov" ],
-        "uniqueId" : "594a3b86-a8bf-4038-b562-88d775ad3c1d",
-        "uuid" : "0ac5440d-8ee2-4377-8410-630058bfbca8",
-        "csarUUID" : "d10cac28981c4396b7b3636b0a69786f",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "9d399f22-604f-4c59-97f8-2d9f04210e54",
-        "allArtifacts" : { },
         "archiveTime" : 0,
-        "name" : "vfwhpa_sriov"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.0da72c3b1abf4bcbBf12",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "6bd17f5a-e397-484c-af52",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547836150223,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "0da72c3b1abf4bcbBf12",
-        "lastUpdateDate" : 1547836204100,
         "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "0da72c3b1abf4bcbbf12",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
+        "uniqueId" : "512dd581-fe42-4e82-b08e-13f5ed5ec071",
         "contactId" : "cs0008",
         "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "0da72c3b-1abf-4bcb-bf12" ],
-        "uniqueId" : "47b15a10-6f27-43fa-bd2c-6a2bd8b98b0a",
-        "uuid" : "79962216-b10a-4f37-af79-39eb50fa7714",
-        "csarUUID" : "911ab62d97034a31b5e6219ff32c93a2",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "3c82f295-256d-4e47-863a-e3612470f16e",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "0da72c3b-1abf-4bcb-bf12"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Load Balancer",
-            "normalizedName" : "load balancer",
-            "uniqueId" : "resourceNewCategory.application l4+.load balancer",
-            "icons" : [ "loadBalancer" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Vlbhpa1",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548288725812,
-        "version" : "1.0",
-        "description" : "vlbhpa test1",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vlbhpa1",
-        "lastUpdateDate" : 1548288773809,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "vlbhpa1",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "vlbhpa_1" ],
-        "uniqueId" : "8421b509-25bb-45a0-ab15-c9a531fa47ae",
-        "uuid" : "3b03b679-c227-42c2-9c64-b94416802bcc",
-        "csarUUID" : "62e221a2489d480fa291aeaa2bea9c52",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "608db6d9-c738-4a08-b455-2789d2bdd0d1",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vlbhpa_1"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.8dc447f79a654b888193",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "4a719c24-3ce8-431d-aee7",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547771921721,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "8dc447f79a654b888193",
-        "lastUpdateDate" : 1547772035767,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "8dc447f79a654b888193",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "8dc447f7-9a65-4b88-8193" ],
-        "uniqueId" : "dc2a6a02-2fe0-494a-b551-84a3a70b9a87",
-        "uuid" : "ffc10ee8-2614-4d8c-b751-a51e0604c253",
-        "csarUUID" : "bc9dfa3d21c1455ea42759d3f045ad28",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "794efef3-c798-4e8d-a02a-42b91ffb8adf",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "8dc447f7-9a65-4b88-8193"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.4e9883c1D06c4554Bdf3",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "3a07540f-4f15-43fe-ac79",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547773585118,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "4e9883c1D06c4554Bdf3",
-        "lastUpdateDate" : 1547773660168,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "4e9883c1d06c4554bdf3",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
+        "normalizedName" : "b6e67bfda2164168a16e",
         "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "4e9883c1-d06c-4554-bdf3" ],
-        "uniqueId" : "f32745f0-8d6e-4d22-8014-cf7869cdf30b",
-        "uuid" : "8e8ed994-bcd7-4159-933e-30de54df1693",
-        "csarUUID" : "a0440d85e9c24f9486e37e42aef206d1",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "879b448c-ca6e-41c1-bee9-07987fc45419",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "4e9883c1-d06c-4554-bdf3"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.C46e4d8b64514428A0cf",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "5a58e574-e97f-4874-a7bd",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547836707775,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "C46e4d8b64514428A0cf",
-        "lastUpdateDate" : 1547836730409,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "c46e4d8b64514428a0cf",
         "actualComponentType" : "VF",
         "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "c46e4d8b-6451-4428-a0cf" ],
-        "uniqueId" : "57cba9f7-924c-4c9c-84c2-563138628a09",
-        "uuid" : "99dbc0d6-027e-40c5-a30e-0bdf53d32aca",
-        "csarUUID" : "6ee2299702ec46cd80c83eab3cb182f9",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "4c50ca91-5fec-4c81-ace9-501c544037fe",
         "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "c46e4d8b-6451-4428-a0cf"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.VfwhpaTest1V2",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548186913629,
-        "version" : "1.0",
-        "description" : "vfwhpa test1",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwhpaTest1V2",
-        "lastUpdateDate" : 1548187126475,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "vfwhpatest1v2",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "vfwhpa_test1_v2" ],
-        "uniqueId" : "fb6f4ec0-7ef0-42ed-8ae0-35bb76eb04ea",
-        "uuid" : "938c41de-98f1-4090-b78b-5f18d0578593",
-        "csarUUID" : "ab143b9d132c45e980c6237cb79b6a2c",
-        "csarVersion" : "1.0",
         "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
+        "invariantUUID" : "7037ee95-babf-4324-a942-e6cf4a99473b",
+        "uuid" : "de0e7941-a28b-4b07-8ba5-b5eb2a39b476",
         "creatorUserId" : "cs0008",
-        "invariantUUID" : "d7686e86-1d1f-4713-99d4-609e6ee0c446",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vfwhpa_test1_v2"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.TestCliVf",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "itohan-vendor",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1553124553133,
-        "version" : "2.0",
-        "description" : "test-ci-vf",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "TestCliVf",
-        "lastUpdateDate" : 1553124663671,
-        "highestVersion" : true,
         "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "testclivf",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test-cli-vf" ],
-        "uniqueId" : "423fbfc4-7763-4934-87cf-84adc7828534",
-        "uuid" : "75a9e4e3-36a9-46c8-b3a5-892175b313d3",
-        "csarUUID" : "54c4c2f26b974f169b362cc20ca434ff",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "ffffd24e-c70a-4238-8c4a-a3c11c3aae35",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test-cli-vf"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Test4",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548456162447,
-        "version" : "1.0",
-        "description" : "test4",
         "componentType" : "RESOURCE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "Test4",
-        "lastUpdateDate" : 1548456254295,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "test4",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test4" ],
-        "uniqueId" : "d7a78344-d4cd-4d54-ad41-e4095e7cbdd2",
-        "uuid" : "3b7dfb19-ebb2-45be-a514-16d2d72980d0",
-        "csarUUID" : "0063e08cd03a4012b381b376e537ebb1",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
+        "systemName" : "B6e67bfdA2164168A16e",
+        "lastUpdateDate" : 1554244588651,
         "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "32d745e6-eac2-44f6-bc5d-492199a71d86",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test4"
+        "csarUUID" : "b5b395e79a3b49e7888c53c9c782db6a",
+        "name" : "b6e67bfd-a216-4168-a16e"
       }, {
         "artifacts" : { },
         "deploymentArtifacts" : { },
@@ -836,553 +95,40 @@
         "derivedFromGenericVersion" : "1.0",
         "toscaType" : "topology_template",
         "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Test5",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
+        "vendorName" : "vfw-hpa-demo",
         "vendorRelease" : "1.0",
         "resourceVendorModelNumber" : "",
-        "creationDate" : 1548445330980,
-        "version" : "1.0",
-        "description" : "test5",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Test5",
-        "lastUpdateDate" : 1548445512220,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "test5",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test5" ],
-        "uniqueId" : "5fdb081b-15ab-460a-b863-ca1ac3508c83",
-        "uuid" : "a1d3fff8-0717-4bb9-a609-e37f3390f3f1",
-        "csarUUID" : "5db09293ff384c738ad5754350630973",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "cef7f7c0-731d-4ae9-95a2-3440d5604002",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test5"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Ef858a2c2397481fB82a",
-        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.VfwHpaSriovV2",
         "abstract" : false,
-        "vendorName" : "6519e766-b68f-4861-b0b5",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547838698112,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Ef858a2c2397481fB82a",
-        "lastUpdateDate" : 1547838720216,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "ef858a2c2397481fb82a",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "ef858a2c-2397-481f-b82a" ],
-        "uniqueId" : "4323315c-b724-4afc-b4c1-9af83659e756",
-        "uuid" : "f6f5409d-50cb-44e1-b84e-13d624801785",
-        "csarUUID" : "37959c2841e244fc805a14fc57220a0c",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "fb516873-9ede-483b-a279-34b3cbb02536",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "ef858a2c-2397-481f-b82a"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.NewCliVsp",
         "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "Itohan-vendor",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1553102480456,
         "version" : "1.0",
-        "description" : "cli-test-vsp",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "NewCliVsp",
-        "lastUpdateDate" : 1553102557819,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "newclivsp",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "new-cli-vsp" ],
-        "uniqueId" : "6c8827d3-0398-4937-a1de-2dd7da909fb4",
-        "uuid" : "f64d24ba-b3e6-42f0-a267-ba46bfddde59",
-        "csarUUID" : "8d5974a45c014ed6ad1b8bcace4a3609",
+        "tags" : [ "vfw-hpa-sriov_v2" ],
+        "description" : "vfw hpa",
+        "creationDate" : 1554412673495,
         "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "ef2ec761-74ee-4283-9eb3-0e96e255e025",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "new-cli-vsp"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.C60aed4eDce444fdA89c",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "6d5a6c71-3222-4cf4-a4f2",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547839064062,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "C60aed4eDce444fdA89c",
-        "lastUpdateDate" : 1547839079521,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "c60aed4edce444fda89c",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
         "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "c60aed4e-dce4-44fd-a89c" ],
-        "uniqueId" : "90040f28-cd3a-4abc-a22e-d8dfbd0abe4f",
-        "uuid" : "51012e88-dd2d-4bdf-960d-ca8d2a7f28bd",
-        "csarUUID" : "729a07cd8a3c4142836555a315305a22",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "68b6f59a-9e39-4e8f-873a-d5c1cadb3882",
-        "allArtifacts" : { },
         "archiveTime" : 0,
-        "name" : "c60aed4e-dce4-44fd-a89c"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.38a68c2aAa6a4088Bb2b",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "14bb164a-194d-43c7-8316",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547838099658,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "38a68c2aAa6a4088Bb2b",
-        "lastUpdateDate" : 1547838122203,
         "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "38a68c2aaa6a4088bb2b",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
+        "uniqueId" : "143748d8-a6e4-4be9-94c2-6138a9444490",
         "contactId" : "cs0008",
         "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "38a68c2a-aa6a-4088-bb2b" ],
-        "uniqueId" : "71ab22e5-79f5-4945-a2c4-116febac9918",
-        "uuid" : "39c766bc-c3a7-4970-afac-54e977fdded3",
-        "csarUUID" : "47cb2a42991548a09b377a3aa9703397",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "d043dd63-4497-4e81-ad9d-0d38c9c40cab",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "38a68c2a-aa6a-4088-bb2b"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.68a79a7203be4180B981",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "1d97c202-997e-4f71-a740",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547836634576,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "68a79a7203be4180B981",
-        "lastUpdateDate" : 1547836673868,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "68a79a7203be4180b981",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
+        "normalizedName" : "vfwhpasriovv2",
         "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "68a79a72-03be-4180-b981" ],
-        "uniqueId" : "21b3ec45-8687-418b-a68c-50547209978b",
-        "uuid" : "6de8667b-58ee-4a32-b853-73d76d5efb35",
-        "csarUUID" : "0ef9544b18154e27862f40457c36bfc7",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "a9ed453c-2249-4eb3-810c-a90fb69e032f",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "68a79a72-03be-4180-b981"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Ad55252eB8bf44c784f7",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "ad7af32c-e5f6-4c7b-8e20",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547838456522,
-        "version" : "1.0",
-        "description" : "vendor software product",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Ad55252eB8bf44c784f7",
-        "lastUpdateDate" : 1547838471012,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "ad55252eb8bf44c784f7",
         "actualComponentType" : "VF",
         "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "ad55252e-b8bf-44c7-84f7" ],
-        "uniqueId" : "ac7895df-5a68-4166-b601-53536e15282f",
-        "uuid" : "6f4cac26-f215-4ac3-b536-ae66dfd19931",
-        "csarUUID" : "3f9aa74f65574a299cbd6f81448846ac",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "12b63a36-b681-4e67-ab9d-4f1616f4b9c6",
         "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "ad55252e-b8bf-44c7-84f7"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.Test5",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "onap_hpa",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1548466018149,
-        "version" : "1.1",
-        "description" : "test5",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
-        "systemName" : "Test5",
-        "lastUpdateDate" : 1548466018149,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "test5",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test5" ],
-        "uniqueId" : "6a9427db-baa5-4951-820d-8d4747b68128",
-        "uuid" : "f33a36c3-9592-437c-9b8e-7a5d12c701a9",
-        "csarUUID" : "5db09293ff384c738ad5754350630973",
-        "csarVersion" : "1.0",
         "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
+        "invariantUUID" : "b7d993a3-3870-4096-a16c-90110d402349",
+        "uuid" : "04ffd583-5625-4471-b20b-38394b513efd",
         "creatorUserId" : "cs0008",
-        "invariantUUID" : "cef7f7c0-731d-4ae9-95a2-3440d5604002",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test5"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Application L4+",
-          "normalizedName" : "application l4+",
-          "uniqueId" : "resourceNewCategory.application l4+",
-          "subcategories" : [ {
-            "name" : "Firewall",
-            "normalizedName" : "firewall",
-            "uniqueId" : "resourceNewCategory.application l4+.firewall",
-            "icons" : [ "firewall" ],
-            "empty" : false
-          } ],
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.TestCli2",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "itohan-vendor",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1553121944459,
-        "version" : "0.1",
-        "description" : "description",
-        "componentType" : "RESOURCE",
-        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
-        "systemName" : "TestCli2",
-        "lastUpdateDate" : 1553121946969,
-        "highestVersion" : true,
         "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "testcli2",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test-cli-2" ],
-        "uniqueId" : "7ed4be03-bcc8-491c-9fed-963afd44d611",
-        "uuid" : "85fed814-8b43-4e0b-903b-330e8198894f",
-        "csarUUID" : "ab365698f8f948cbb358ca4fd72923c3",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "97aae1f7-9b20-4bb9-945b-6ede83140a07",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test-cli-2"
-      }, {
-        "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",
-        "interfaces" : { },
-        "toscaResourceName" : "org.openecomp.resource.vf.46f8da6675c2478687dc",
-        "resourceType" : "VF",
-        "abstract" : false,
-        "vendorName" : "793af38e-3448-46fc-afa5",
-        "vendorRelease" : "1.0",
-        "resourceVendorModelNumber" : "",
-        "creationDate" : 1547837628932,
-        "version" : "1.0",
-        "description" : "vendor software product",
         "componentType" : "RESOURCE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "46f8da6675c2478687dc",
-        "lastUpdateDate" : 1547837669781,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "46f8da6675c2478687dc",
-        "actualComponentType" : "VF",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "46f8da66-75c2-4786-87dc" ],
-        "uniqueId" : "3bb3583c-784b-4e3d-9b64-458d46e9036d",
-        "uuid" : "9ff3da4e-f594-4e7d-abba-b413dd2c95d7",
-        "csarUUID" : "21116b5c438b4949b24fda554d2ff555",
-        "csarVersion" : "1.0",
-        "icon" : "defaulticon",
+        "systemName" : "VfwHpaSriovV2",
+        "lastUpdateDate" : 1554412686835,
         "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "23c2d08b-c513-40bf-afa6-9ba8f9da323f",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "46f8da66-75c2-4786-87dc"
+        "csarUUID" : "13a62878030c464095d2727381299565",
+        "name" : "vfw-hpa-sriov_v2"
       } ],
       "services" : [ {
         "artifacts" : { },
@@ -1402,60 +148,6 @@
         "interfaces" : { },
         "serviceApiArtifacts" : { },
         "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548198561417,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfw2019012223:09:19",
-        "lastUpdateDate" : 1548198685194,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfw2019012223:09:19",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "vFW 2019-01-22 23:09:19" ],
-        "uniqueId" : "a1b151c2-0395-4941-b6cc-3ac110f56412",
-        "uuid" : "649daac3-7635-43d6-a751-da41cfad4d0f",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "806c1ce1-8d95-40bb-85dd-85778984b41c",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vFW 2019-01-22 23:09:19"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
         "projectCode" : "000000",
         "environmentContext" : "General_Revenue-Bearing",
         "serviceType" : "",
@@ -1463,669 +155,34 @@
         "ecompGeneratedNaming" : true,
         "namingPolicy" : "",
         "instantiationType" : "A-la-carte",
-        "creationDate" : 1548182108168,
-        "version" : "1.0",
-        "description" : "vfwhpa template 1",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfwhpa1",
-        "lastUpdateDate" : 1548185076139,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfwhpa1",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "vfwhpa_1" ],
-        "uniqueId" : "dc92d262-f649-4922-9ab6-2c0c2b3a1e4b",
-        "uuid" : "267bb62f-8fb9-4138-a59a-61e5465cabfe",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "b80226f9-2e39-45da-8c17-1d9f5d2b67df",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vfwhpa_1"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
         "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547838437518,
         "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovcpevbrgemu",
-        "lastUpdateDate" : 1547838502547,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovcpevbrgemu",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
+        "tags" : [ "vfw-demo-service" ],
+        "description" : "vfw demo service",
+        "creationDate" : 1554412767728,
         "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVCPEvBRGEMU" ],
-        "uniqueId" : "ceaaa7da-cae6-403b-85cf-e4c9d201380b",
-        "uuid" : "494ad4a3-971f-45b8-818e-db9e58b5dc7f",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "f4487f7f-be15-4f19-902d-dd89c2f88fa9",
-        "allArtifacts" : { },
         "archiveTime" : 0,
-        "name" : "demoVCPEvBRGEMU"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "000000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548270335712,
-        "version" : "1.0",
-        "description" : "vfwhpa sriov",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VfwhpaSriov",
-        "lastUpdateDate" : 1548270887724,
         "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfwhpasriov",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
+        "uniqueId" : "7929bce5-5f06-4514-82b2-f33c03e8b2ab",
         "contactId" : "cs0008",
         "conformanceLevel" : "9.0",
         "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "vfwhpa_sriov" ],
-        "uniqueId" : "487d626e-7b31-48b8-9054-cda98296bb2e",
-        "uuid" : "b6a65cb3-3a2e-4a9e-a50d-c09aebd93156",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "272ce4d5-e260-4c23-a6d5-9255939fb08e",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vfwhpa_sriov"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTION_APPROVED",
-        "projectCode" : "54321",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1550703627829,
-        "version" : "3.0",
-        "description" : "test5",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Test5",
-        "lastUpdateDate" : 1550704363031,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "test5",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
+        "normalizedName" : "vfwdemoservice",
         "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "test5" ],
-        "uniqueId" : "32b65499-a671-4b71-8990-158d1b045812",
-        "uuid" : "66c5bd88-f389-49e4-8875-604f8817cef6",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "3ed236ef-7d4e-4906-92f1-05340d128c97",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test5"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547837079318,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovlb",
-        "lastUpdateDate" : 1547837171997,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovlb",
         "actualComponentType" : "Service",
         "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVLB" ],
-        "uniqueId" : "21fe32d3-1da8-46b5-a52b-6bc9c78846cd",
-        "uuid" : "2f11859a-0305-489a-b62d-55d1e43e97c6",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "bec0c12a-41ef-4f5d-92c1-4299968b8438",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "demoVLB"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
-        "projectCode" : "000000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1553196125569,
-        "version" : "1.2",
-        "description" : "create service model with cli",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "NOT_CERTIFIED_CHECKIN",
-        "systemName" : "CliServiceMod",
-        "lastUpdateDate" : 1553198632792,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "cliservicemod",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "cli-service-mod" ],
-        "uniqueId" : "2d488818-2e62-46fd-a627-df8677ac4d74",
-        "uuid" : "32110371-0b6e-4146-813d-2505008a82d4",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "36a18432-57d2-4d67-b67a-19b219cc0113",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "cli-service-mod"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547771792056,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfw2019011800:36:26",
-        "lastUpdateDate" : 1547772127033,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfw2019011800:36:26",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "vFW 2019-01-18 00:36:26" ],
-        "uniqueId" : "f51d0273-bb68-4df6-8667-4700216c4329",
-        "uuid" : "c6dc9092-521e-4636-b705-426ddda9020a",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "f6ec1549-8a0a-43c8-91e5-83c52d735c65",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vFW 2019-01-18 00:36:26"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "12345",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548456310043,
-        "version" : "1.0",
-        "description" : "test4 stuff",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Test4Stuff",
-        "lastUpdateDate" : 1548465403180,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "test4stuff",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "test4-stuff" ],
-        "uniqueId" : "1915880d-8b75-4e72-aede-15f07c1790a2",
-        "uuid" : "fb277d9c-bad5-4357-8299-e2316b564c3c",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "21fcf68b-add4-4f59-8eb1-c10ee590f048",
         "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test4-stuff"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547839040830,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovcpevgw",
-        "lastUpdateDate" : 1547839116946,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovcpevgw",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVCPEvGW" ],
-        "uniqueId" : "ed8cfb84-811c-4619-a92e-31d61be7db82",
-        "uuid" : "38aa866d-1d83-420c-bfc9-271fee48efed",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "1f7f8a12-fdaa-4d3e-913b-96888a60ff87",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "demoVCPEvGW"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "000001",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548353929340,
-        "version" : "1.0",
-        "description" : "vlbhpa sriov",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "VlbhpaSriov",
-        "lastUpdateDate" : 1548354668256,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vlbhpasriov",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "vlbhpa_sriov" ],
-        "uniqueId" : "45449bc4-e269-4f79-9ba4-6f808ec8f936",
-        "uuid" : "84d1c9fb-57e4-42e8-be33-82c51c2c65fd",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "a06eb8da-1bf9-4eb5-9c9e-a6f49fb760e5",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vlbhpa_sriov"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
-        "projectCode" : "000000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1553192910482,
-        "version" : "1.0",
-        "description" : "create service model with cli",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "CliService",
-        "lastUpdateDate" : 1553194117643,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "cliservice",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "cli-service" ],
-        "uniqueId" : "87d3570a-2d08-4b5a-bb51-c7744b32b8de",
-        "uuid" : "788289e1-161a-42b8-89ed-14adde63c600",
         "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
+        "invariantUUID" : "41d0ebba-4b89-4437-9b22-4d83d2183aaa",
+        "uuid" : "545bca3c-8cc0-4dac-b464-1720894e0213",
         "creatorUserId" : "jm0007",
-        "invariantUUID" : "4dd682d8-4c3c-4f6c-96b1-9e19eed5987c",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "cli-service"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "000000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1553191779187,
-        "version" : "1.0",
-        "description" : "create service model with cli",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "CliServiceMod",
-        "lastUpdateDate" : 1553195447028,
-        "highestVersion" : true,
         "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "cliservicemod",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "cli-service-mod" ],
-        "uniqueId" : "054425a1-5580-4758-ac33-ce817c8c7903",
-        "uuid" : "a4208283-3330-45f2-a0d4-4969931ffc06",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "36a18432-57d2-4d67-b67a-19b219cc0113",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "cli-service-mod"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547837604832,
-        "version" : "1.0",
-        "description" : "catalog service description",
         "componentType" : "SERVICE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovcpeinfra",
-        "lastUpdateDate" : 1547837730532,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovcpeinfra",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVCPEInfra" ],
-        "uniqueId" : "d079370b-2238-4e45-acb6-3875a091b73c",
-        "uuid" : "6575fa2f-eed4-4ea5-bed1-ef349ab3ac04",
-        "icon" : "network_l_1-3",
+        "systemName" : "VfwDemoService",
+        "lastUpdateDate" : 1554414709904,
         "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "3d3fea3d-2f02-4cb1-8dc7-63962b05b0b3",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "demoVCPEInfra"
+        "name" : "vfw-demo-service"
       }, {
         "artifacts" : { },
         "deploymentArtifacts" : { },
@@ -2144,7 +201,6 @@
         "interfaces" : { },
         "serviceApiArtifacts" : { },
         "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
         "projectCode" : "123456",
         "environmentContext" : "General_Revenue-Bearing",
         "serviceType" : "",
@@ -2152,510 +208,34 @@
         "ecompGeneratedNaming" : true,
         "namingPolicy" : "",
         "instantiationType" : "A-la-carte",
-        "creationDate" : 1547838680752,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovcpevgmux",
-        "lastUpdateDate" : 1547838779425,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovcpevgmux",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVCPEvGMUX" ],
-        "uniqueId" : "679ca983-681c-493d-96ec-048fd861533c",
-        "uuid" : "eac0c183-02af-4ac1-9575-7968a684d99a",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "cf3bd118-87fa-4f4f-ad44-e34dabc610f1",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "demoVCPEvGMUX"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
         "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547836107304,
         "version" : "1.0",
+        "tags" : [ "robot-ete", "vFW 2019-04-02 22:36:04" ],
         "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfw2019011818:28:25",
-        "lastUpdateDate" : 1547836259114,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfw2019011818:28:25",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
+        "creationDate" : 1554244565488,
         "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "vFW 2019-01-18 18:28:25" ],
-        "uniqueId" : "e0ba34fa-38d2-46cb-b82e-8c04ff1efa44",
-        "uuid" : "57814c32-c9ba-4cf4-bfb7-44e9182a461c",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "d44dcfb2-73e4-4ea0-978f-26ca89208ad5",
-        "allArtifacts" : { },
         "archiveTime" : 0,
-        "name" : "vFW 2019-01-18 18:28:25"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
-        "projectCode" : "12345",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "ewm",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548371886695,
-        "version" : "2.1",
-        "description" : "test",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "NOT_CERTIFIED_CHECKIN",
-        "systemName" : "Test1",
-        "lastUpdateDate" : 1548371899574,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "test1",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test1" ],
-        "uniqueId" : "83a40623-978c-4c82-bf09-0f31afa2ee9b",
-        "uuid" : "d1f397bd-37af-4bc1-8d85-9dd28874067b",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "20b22b50-2ecd-438e-8e0d-bd3e545adc9e",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test1"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "000001",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548288668671,
-        "version" : "1.0",
-        "description" : "vlbhpa",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vlbhpa",
-        "lastUpdateDate" : 1548289721636,
         "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vlbhpa",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
+        "uniqueId" : "7545af33-5b19-44b9-925f-b7f897e95a9e",
         "contactId" : "cs0008",
         "conformanceLevel" : "9.0",
         "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "vlbhpa" ],
-        "uniqueId" : "fd1ab038-b435-40b3-8c4c-9afcea8cf7c0",
-        "uuid" : "75f07bc5-795e-4d95-8d8f-1fbe5fb20a15",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "a760fd12-9277-4df7-9ed9-99c18ea024b5",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vlbhpa"
-      }, {
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547773502225,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfw2019011801:05:00",
-        "lastUpdateDate" : 1547773740889,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfw2019011801:05:00",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
+        "normalizedName" : "vfw2019040222:36:04",
         "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "vFW 2019-01-18 01:05:00" ],
-        "uniqueId" : "44319054-5ade-4e0f-8365-790873523152",
-        "uuid" : "119df9b2-1b33-4e92-a45a-c71dcec1dcc4",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "ed73e305-e816-4f90-bd34-52e552d0e9d4",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vFW 2019-01-18 01:05:00"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "00000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548187210111,
-        "version" : "1.0",
-        "description" : "vfwhpa test1",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Vfwhpa1V2",
-        "lastUpdateDate" : 1548201644221,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "vfwhpa1v2",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "vfwhpa_1_v2" ],
-        "uniqueId" : "cd1eccc5-2a25-4e56-8a0f-d1ec12479a34",
-        "uuid" : "89eb25dc-eb87-4a06-84c6-84824ea17d34",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "36897c30-14f1-4164-9ad0-6ff011bfd4e3",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "vfwhpa_1_v2"
-      }, {
-        "artifacts" : { },
-        "deploymentArtifacts" : { },
-        "toscaArtifacts" : { },
-        "categories" : [ {
-          "name" : "Network L4+",
-          "normalizedName" : "network l4+",
-          "uniqueId" : "serviceNewCategory.network l4+",
-          "empty" : false
-        } ],
-        "componentInstancesRelations" : [ ],
-        "capabilities" : { },
-        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
-        "derivedFromGenericVersion" : "1.0",
-        "toscaType" : "topology_template",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
-        "projectCode" : "000000",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1553123652987,
-        "version" : "0.1",
-        "description" : "hhh",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "NOT_CERTIFIED_CHECKIN",
-        "systemName" : "Test",
-        "lastUpdateDate" : 1553198103319,
-        "highestVersion" : true,
-        "creatorFullName" : "Carlos Santana",
-        "normalizedName" : "test",
         "actualComponentType" : "Service",
         "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Carlos Santana",
-        "tags" : [ "test" ],
-        "uniqueId" : "28f8a25b-d59c-45db-9ab0-94f4c0e8a4fc",
-        "uuid" : "edf01a49-ab3b-4e93-8b45-64e583f625b5",
-        "icon" : "defaulticon",
-        "lastUpdaterUserId" : "cs0008",
-        "creatorUserId" : "cs0008",
-        "invariantUUID" : "3943694b-c5ad-44fd-9ec3-242a19538456",
         "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547836608133,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovfwcl",
-        "lastUpdateDate" : 1547836793214,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovfwcl",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVFWCL" ],
-        "uniqueId" : "0d360a50-3e89-423c-b6e7-56a2292130e0",
-        "uuid" : "c0f93a15-76e7-4dd6-9983-4dd49af3ef2c",
         "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
+        "invariantUUID" : "00d2740e-705b-4f90-a1d0-6f61c131d4fc",
+        "uuid" : "e5d812e6-6c6e-45f0-a3a5-e231d2a328be",
         "creatorUserId" : "jm0007",
-        "invariantUUID" : "dee10a79-1775-4626-b14b-c12217f7fd1c",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "123456",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1547838082991,
-        "version" : "1.0",
-        "description" : "catalog service description",
-        "componentType" : "SERVICE",
-        "lifecycleState" : "CERTIFIED",
-        "systemName" : "Demovcpevbng",
-        "lastUpdateDate" : 1547838179447,
-        "highestVersion" : true,
         "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "demovcpevbng",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "robot-ete", "demoVCPEvBNG" ],
-        "uniqueId" : "4e6c59b3-064f-41b7-b574-9d9d287193ca",
-        "uuid" : "325b72f4-00b0-4f9d-8da5-4475cac9a940",
-        "icon" : "network_l_1-3",
-        "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "1a3e0408-f95c-415e-8f90-e729722d3711",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "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",
-        "interfaces" : { },
-        "serviceApiArtifacts" : { },
-        "forwardingPaths" : { },
-        "distributionStatus" : "DISTRIBUTED",
-        "projectCode" : "12345",
-        "environmentContext" : "General_Revenue-Bearing",
-        "serviceType" : "",
-        "serviceRole" : "",
-        "ecompGeneratedNaming" : true,
-        "namingPolicy" : "ewm",
-        "instantiationType" : "A-la-carte",
-        "creationDate" : 1548187216147,
-        "version" : "2.0",
-        "description" : "test",
         "componentType" : "SERVICE",
         "lifecycleState" : "CERTIFIED",
-        "systemName" : "Test1",
-        "lastUpdateDate" : 1548187992033,
-        "highestVersion" : true,
-        "creatorFullName" : "Joni Mitchell",
-        "normalizedName" : "test1",
-        "actualComponentType" : "Service",
-        "topologyTemplate" : true,
-        "vspArchived" : false,
-        "archived" : false,
-        "contactId" : "cs0008",
-        "conformanceLevel" : "9.0",
-        "lastUpdaterFullName" : "Joni Mitchell",
-        "tags" : [ "test1" ],
-        "uniqueId" : "d59c12e9-337e-48c6-b867-042b85965517",
-        "uuid" : "94420648-136b-44a5-8bef-58962925ca42",
-        "icon" : "defaulticon",
+        "systemName" : "Vfw2019040222:36:04",
+        "lastUpdateDate" : 1554244609192,
         "lastUpdaterUserId" : "jm0007",
-        "creatorUserId" : "jm0007",
-        "invariantUUID" : "20b22b50-2ecd-438e-8e0d-bd3e545adc9e",
-        "allArtifacts" : { },
-        "archiveTime" : 0,
-        "name" : "test1"
+        "name" : "vFW 2019-04-02 22:36:04"
       } ]
     }
   }
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-sample.yaml
index 8aea2a08..f8f3f421 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-dublin-sample.yaml
@@ -1,73 +1,16 @@
-# Copyright © Intel Corporation 2019
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 open_cli_sample_version: 1.0
 name: -u
 version: onap-dublin
 samples:
   sample1:
     name: -u
-    input: cs0008 -p demo123456! -m http://10.12.6.129:30205
+    input: cs0008 -p demo123456! -m http://192.168.1.147:30205 -s
     moco: service-model-list-schema-dublin-moco.json
     output: |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |uuid                                  |invariant-uuid                        |name                      |version   |status                  |distribution-status         |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |a1b151c2-0395-4941-b6cc-3ac110f56412  |806c1ce1-8d95-40bb-85dd-85778984b41c  |vFW 2019-01-22 23:09:19   |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |dc92d262-f649-4922-9ab6-2c0c2b3a1e4b  |b80226f9-2e39-45da-8c17-1d9f5d2b67df  |vfwhpa_1                  |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |ceaaa7da-cae6-403b-85cf-e4c9d201380b  |f4487f7f-be15-4f19-902d-dd89c2f88fa9  |demoVCPEvBRGEMU           |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |487d626e-7b31-48b8-9054-cda98296bb2e  |272ce4d5-e260-4c23-a6d5-9255939fb08e  |vfwhpa_sriov              |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |32b65499-a671-4b71-8990-158d1b045812  |3ed236ef-7d4e-4906-92f1-05340d128c97  |test5                     |3.0       |CERTIFIED               |DISTRIBUTION_APPROVED       |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |21fe32d3-1da8-46b5-a52b-6bc9c78846cd  |bec0c12a-41ef-4f5d-92c1-4299968b8438  |demoVLB                   |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |2d488818-2e62-46fd-a627-df8677ac4d74  |36a18432-57d2-4d67-b67a-19b219cc0113  |cli-service-mod           |1.2       |NOT_CERTIFIED_CHECKIN   |DISTRIBUTION_NOT_APPROVED   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |f51d0273-bb68-4df6-8667-4700216c4329  |f6ec1549-8a0a-43c8-91e5-83c52d735c65  |vFW 2019-01-18 00:36:26   |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |1915880d-8b75-4e72-aede-15f07c1790a2  |21fcf68b-add4-4f59-8eb1-c10ee590f048  |test4-stuff               |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |ed8cfb84-811c-4619-a92e-31d61be7db82  |1f7f8a12-fdaa-4d3e-913b-96888a60ff87  |demoVCPEvGW               |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |45449bc4-e269-4f79-9ba4-6f808ec8f936  |a06eb8da-1bf9-4eb5-9c9e-a6f49fb760e5  |vlbhpa_sriov              |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |87d3570a-2d08-4b5a-bb51-c7744b32b8de  |4dd682d8-4c3c-4f6c-96b1-9e19eed5987c  |cli-service               |1.0       |CERTIFIED               |DISTRIBUTION_NOT_APPROVED   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |054425a1-5580-4758-ac33-ce817c8c7903  |36a18432-57d2-4d67-b67a-19b219cc0113  |cli-service-mod           |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |d079370b-2238-4e45-acb6-3875a091b73c  |3d3fea3d-2f02-4cb1-8dc7-63962b05b0b3  |demoVCPEInfra             |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |679ca983-681c-493d-96ec-048fd861533c  |cf3bd118-87fa-4f4f-ad44-e34dabc610f1  |demoVCPEvGMUX             |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |e0ba34fa-38d2-46cb-b82e-8c04ff1efa44  |d44dcfb2-73e4-4ea0-978f-26ca89208ad5  |vFW 2019-01-18 18:28:25   |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |83a40623-978c-4c82-bf09-0f31afa2ee9b  |20b22b50-2ecd-438e-8e0d-bd3e545adc9e  |test1                     |2.1       |NOT_CERTIFIED_CHECKIN   |DISTRIBUTION_NOT_APPROVED   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |fd1ab038-b435-40b3-8c4c-9afcea8cf7c0  |a760fd12-9277-4df7-9ed9-99c18ea024b5  |vlbhpa                    |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |44319054-5ade-4e0f-8365-790873523152  |ed73e305-e816-4f90-bd34-52e552d0e9d4  |vFW 2019-01-18 01:05:00   |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |cd1eccc5-2a25-4e56-8a0f-d1ec12479a34  |36897c30-14f1-4164-9ad0-6ff011bfd4e3  |vfwhpa_1_v2               |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |28f8a25b-d59c-45db-9ab0-94f4c0e8a4fc  |3943694b-c5ad-44fd-9ec3-242a19538456  |test                      |0.1       |NOT_CERTIFIED_CHECKIN   |DISTRIBUTION_NOT_APPROVED   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |0d360a50-3e89-423c-b6e7-56a2292130e0  |dee10a79-1775-4626-b14b-c12217f7fd1c  |demoVFWCL                 |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |4e6c59b3-064f-41b7-b574-9d9d287193ca  |1a3e0408-f95c-415e-8f90-e729722d3711  |demoVCPEvBNG              |1.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |d59c12e9-337e-48c6-b867-042b85965517  |20b22b50-2ecd-438e-8e0d-bd3e545adc9e  |test1                     |2.0       |CERTIFIED               |DISTRIBUTED                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------+----------------------+------------------------------+
+      |uuid                                  |invariant-uuid                        |name                      |version   |status      |distribution-status   |description                   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------+----------------------+------------------------------+
+      |545bca3c-8cc0-4dac-b464-1720894e0213  |41d0ebba-4b89-4437-9b22-4d83d2183aaa  |vfw-demo-service          |1.0       |CERTIFIED   |DISTRIBUTED           |vfw demo service              |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------+----------------------+------------------------------+
+      |e5d812e6-6c6e-45f0-a3a5-e231d2a328be  |00d2740e-705b-4f90-a1d0-6f61c131d4fc  |vFW 2019-04-02 22:36:04   |1.0       |CERTIFIED   |DISTRIBUTED           |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------+----------------------+------------------------------+
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
new file mode 100644
index 00000000..01e0cad3
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
@@ -0,0 +1,50 @@
+# 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: get-resource-module-name
+description: Get resource module name
+
+info:
+  product: onap-dublin
+  service: sdc
+  author: ONAP HPA Team onap-discuss@lists.onap.org
+
+
+results:
+  direction: landscape
+  attributes:
+    - name: service-model-vsp
+      description: name of vsp in service model
+      type: string
+      scope: short
+    - name: resource-module-name
+      description: system name of vsp
+      type: string
+      scope: short
+
+http:
+  service:
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /sdc2/rest/v1/followed
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    service-model-vsp: $b{resources.[*].name}
+    resource-module-name: $b{resources.[*].systemName}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
index 193e8645..41b56556 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
@@ -66,11 +66,10 @@ http:
   success_codes:
     - 200
   result_map:
-    uuid: $b{services.[*].uniqueId}
+    uuid: $b{services.[*].uuid}
     invariant-uuid: $b{services.[*].invariantUUID}
     version: $b{services.[*].version}
     name: $b{services.[*].name}
     status: $b{services.[*].lifecycleState}
     description: $b{services.[*].description}
     distribution-status: $b{services.[*].distributionStatus}
-