Add support for listing service models

CLI-57

Change-Id: I6c402ab319d65d558f83c60c173c14b33d3034bd
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

3 files changed, 747 insertions, 0 deletions

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml
new file mode 100644
index 00000000..315f800f
--- /dev/null
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml
@@ -0,0 +1,57 @@
+open_cli_schema_version: 1.0
+name: service-model-list
+description: List the service model in SDC
+version: onap-1.1
+service:
+  name: sdc
+  version: v1.0
+  auth: basic
+  mode: direct
+
+results:
+  direction: landscape
+  attributes:
+    - name: uuid
+      description: UUID
+      type: string
+      scope: short
+    - name: invariant-uuid
+      description: Invariant UUID
+      type: string
+      scope: short
+    - name: name
+      description: Name
+      type: string
+      scope: short
+    - name: version
+      description: version
+      type: string
+      scope: short
+    - name: status
+      description: status
+      type: string
+      scope: short
+    - name: distribution-status
+      description: status
+      type: string
+      scope: short
+    - name: description
+      description: description
+      type: string
+      scope: long
+
+http:
+  request:
+    uri: /sdc2/rest/v1/followed
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    uuid: $b{services.[*].uniqueId}
+    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}
+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json
new file mode 100644
index 00000000..fc826953
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json
@@ -0,0 +1,666 @@
+[ {
+  "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-9f8a725b-ac09-479a-9d73-8d9d9c7a4a86",
+      "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" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.KanagVsp",
+        "vendorName" : "Kanag",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "compute",
+        "creationDate" : 1508929569473,
+        "version" : "1.0",
+        "description" : "Test VSP created by Kanag",
+        "tags" : [ "Kanag-VSP" ],
+        "uniqueId" : "dac5b070-e53b-44b3-8034-46c9cf797de3",
+        "normalizedName" : "kanagvsp",
+        "invariantUUID" : "d3d50449-a81a-497f-97b3-4eb770ea67e7",
+        "lastUpdateDate" : 1508932068347,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "9859e26c-2af2-427b-a837-04a47996d52a",
+        "systemName" : "KanagVsp",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "NjYyMDY3ZWFiODI0MDI0ZGVhNDExMmJkY2JjYmU0Y2M=",
+        "name" : "Kanag-VSP"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.847cb26a59a6475a94dd",
+        "vendorName" : "01eb54a1-f1ff-41a2-aafc",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508827943845,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "847cb26a-59a6-475a-94dd" ],
+        "uniqueId" : "047b9ff8-2414-45b7-b753-26342369f160",
+        "normalizedName" : "847cb26a59a6475a94dd",
+        "invariantUUID" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49",
+        "lastUpdateDate" : 1508827950911,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe",
+        "systemName" : "847cb26a59a6475a94dd",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "a8cd007fa101470e98516cd4549c568f",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "MjMyOTE5ODNjMGE3M2JjN2QzN2MwNWQ4NDI3YTIwMGY=",
+        "name" : "847cb26a-59a6-475a-94dd"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.74361edeEf8c43f19d82",
+        "vendorName" : "c6ba2ef6-fe82-4f32-ad50",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508827987856,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "74361ede-ef8c-43f1-9d82" ],
+        "uniqueId" : "6e29f979-6f36-4c0d-8605-e59da8d62cb7",
+        "normalizedName" : "74361edeef8c43f19d82",
+        "invariantUUID" : "1bd7f899-01dc-4d7f-97d8-f38ba6b40dd9",
+        "lastUpdateDate" : 1508827994610,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "c763b7f8-6bc3-42a2-afa7-04157f79b629",
+        "systemName" : "74361edeEf8c43f19d82",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "c212437049004e74b4ef0afb25ba41b8",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "ZjY3MWM3YzEwMmY1MjE3NTI4ZTY0ODY0ZGZlMjAzZjk=",
+        "name" : "74361ede-ef8c-43f1-9d82"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.136ab24188ff443a88e8",
+        "vendorName" : "1e5d1422-1f5f-42fe-a98e",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508828040751,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "136ab241-88ff-443a-88e8" ],
+        "uniqueId" : "3a3fb778-1c0e-41a1-9a04-f7ddaaf93d73",
+        "normalizedName" : "136ab24188ff443a88e8",
+        "invariantUUID" : "414da4ea-e482-4ed2-9941-bd90108376fa",
+        "lastUpdateDate" : 1508828046003,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "94d78d38-d5ae-4a92-9d9e-fb79fc55195a",
+        "systemName" : "136ab24188ff443a88e8",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "5f5121f701df4fe588c966002a342fdf",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "YmIxZjEzMjMzMDdlYjFkZjRjOTM2YjZmNDhiYjY2OWE=",
+        "name" : "136ab241-88ff-443a-88e8"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.Ef35d3c9A8c6457cA115",
+        "vendorName" : "0138a2e2-52bf-4f0b-81cd",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508828081484,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "ef35d3c9-a8c6-457c-a115" ],
+        "uniqueId" : "f4be1629-c9a1-4f32-8f34-11eddabffc13",
+        "normalizedName" : "ef35d3c9a8c6457ca115",
+        "invariantUUID" : "7fd3788f-a065-4270-bb95-852eae3a94b3",
+        "lastUpdateDate" : 1508828086748,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "3575fbff-614c-4418-93c7-133dc4fc59b6",
+        "systemName" : "Ef35d3c9A8c6457cA115",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "03774c7cfcac4054bdab346142214533",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "YzJmN2VlN2JmZTMwMzM0YWU4NGY1ODk0MjU2MzY4YjE=",
+        "name" : "ef35d3c9-a8c6-457c-a115"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.KanagVsp",
+        "vendorName" : "Kanag",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "compute",
+        "creationDate" : 1508933968515,
+        "version" : "1.1",
+        "description" : "Test VSP created by Kanag",
+        "tags" : [ "Kanag-VSP" ],
+        "uniqueId" : "13d537e4-86c9-4437-88a4-e21f135335bb",
+        "normalizedName" : "kanagvsp",
+        "invariantUUID" : "d3d50449-a81a-497f-97b3-4eb770ea67e7",
+        "lastUpdateDate" : 1508933968515,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
+        "uuid" : "7f7531a7-9e2b-4c95-b879-9aed49f5f715",
+        "systemName" : "KanagVsp",
+        "lastUpdaterUserId" : "cs0008",
+        "highestVersion" : true,
+        "creatorFullName" : "Carlos Santana",
+        "allArtifacts" : { },
+        "creatorUserId" : "cs0008",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "csarUUID" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "NjYyMDY3ZWFiODI0MDI0ZGVhNDExMmJkY2JjYmU0Y2M=",
+        "name" : "Kanag-VSP"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.5d11dda4Fb324df686eb",
+        "vendorName" : "48fa02ef-e79b-4707-895e",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508828061097,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "5d11dda4-fb32-4df6-86eb" ],
+        "uniqueId" : "372e2c66-ee59-4488-a6a6-546c28b3a151",
+        "normalizedName" : "5d11dda4fb324df686eb",
+        "invariantUUID" : "244b380b-acf1-4545-8d35-d6d01bc32fd6",
+        "lastUpdateDate" : 1508828066273,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "87c5f870-809f-4488-aae5-80ef0fd9e085",
+        "systemName" : "5d11dda4Fb324df686eb",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "54bc478b7a9847db82156edad5d1f79f",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "NTM3N2NlZmQ3ZTI1MmFmMzgzM2U3NWJlNDAzOWZkMzI=",
+        "name" : "5d11dda4-fb32-4df6-86eb"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Generic",
+          "normalizedName" : "generic",
+          "uniqueId" : "resourceNewCategory.generic",
+          "subcategories" : [ {
+            "name" : "Abstract",
+            "normalizedName" : "abstract",
+            "uniqueId" : "resourceNewCategory.generic.abstract",
+            "icons" : [ "objectStorage", "compute" ]
+          } ]
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.8fd2e5c8981d4a14Ba77",
+        "vendorName" : "3029be5e-9135-4083-bd2e",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1508828010460,
+        "version" : "1.0",
+        "description" : "vendor software product",
+        "tags" : [ "8fd2e5c8-981d-4a14-ba77" ],
+        "uniqueId" : "23018f7f-fbce-479e-a77b-6b98ebf03266",
+        "normalizedName" : "8fd2e5c8981d4a14ba77",
+        "invariantUUID" : "6bc22345-395d-4358-8954-45963761f968",
+        "lastUpdateDate" : 1508828020764,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "d49dd5ee-bc53-44d7-a067-e4cba9a3be1a",
+        "systemName" : "8fd2e5c8981d4a14Ba77",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "0cefd6ef5ad84d2995d66d0a24d2e92e",
+        "csarVersion" : "1.0",
+        "importedToscaChecksum" : "MDhiZWY1ZDE1NDNiNzQzODM1MWU5N2U4MWE5M2U5ODA=",
+        "name" : "8fd2e5c8-981d-4a14-ba77"
+      } ],
+      "services" : [ {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTED",
+        "projectCode" : "123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_1-3",
+        "creationDate" : 1508827925331,
+        "version" : "1.0",
+        "description" : "catalog service description",
+        "tags" : [ "robot-ete", "demoVLB" ],
+        "uniqueId" : "0f4203a8-a314-47bb-9a7d-28157652cec4",
+        "normalizedName" : "demovlb",
+        "invariantUUID" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
+        "lastUpdateDate" : 1508827967051,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
+        "systemName" : "Demovlb",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "name" : "demoVLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_APPROVED",
+        "projectCode" : "123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_1-3",
+        "creationDate" : 1508827921184,
+        "version" : "1.0",
+        "description" : "catalog service description",
+        "tags" : [ "robot-ete", "demoVFW" ],
+        "uniqueId" : "75caf010-9f14-424d-93c4-9f8fe8be7970",
+        "normalizedName" : "demovfw",
+        "invariantUUID" : "b51013b7-e2bb-4abb-8f45-8e32113264b3",
+        "lastUpdateDate" : 1508828614579,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "e5284e3b-aa7c-42ff-9c98-d0ff4bafa1b6",
+        "systemName" : "Demovfw",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "name" : "demoVFW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L4+",
+          "normalizedName" : "network l4+",
+          "uniqueId" : "serviceNewCategory.network l4+"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTED",
+        "projectCode" : "project-123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_4",
+        "creationDate" : 1508932518934,
+        "version" : "1.0",
+        "description" : "First service created.",
+        "tags" : [ "Kanag-vFW-Service" ],
+        "uniqueId" : "5b054e09-9cc3-49bd-8962-e014465e295b",
+        "normalizedName" : "kanagvfwservice",
+        "invariantUUID" : "3a6a08c8-9bbe-4650-a1c5-687fb1012b98",
+        "lastUpdateDate" : 1508933022032,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "2b97ccad-9fef-42ae-bb1c-a45f550506cb",
+        "systemName" : "KanagVfwService",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "name" : "Kanag-vFW-Service"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTED",
+        "projectCode" : "123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_1-3",
+        "creationDate" : 1508827970387,
+        "version" : "1.0",
+        "description" : "catalog service description",
+        "tags" : [ "robot-ete", "demoVCPE" ],
+        "uniqueId" : "c9aa6a9c-dddd-4019-8f7b-70c09de68e96",
+        "normalizedName" : "demovcpe",
+        "invariantUUID" : "dd04c1c2-beb2-4b6c-997d-c94fae54fb57",
+        "lastUpdateDate" : 1508828105816,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "a439858b-dcb4-43b3-8c83-6fd6f42e21f2",
+        "systemName" : "Demovcpe",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "name" : "demoVCPE"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
+        "projectCode" : "123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_1-3",
+        "creationDate" : 1508838795082,
+        "version" : "1.1",
+        "description" : "catalog service description",
+        "tags" : [ "robot-ete", "demoVFW" ],
+        "uniqueId" : "f2a9f7e3-ead9-4585-8f5f-665acc6cff1c",
+        "normalizedName" : "demovfw",
+        "invariantUUID" : "b51013b7-e2bb-4abb-8f45-8e32113264b3",
+        "lastUpdateDate" : 1508838795082,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
+        "uuid" : "cfe8a390-82a0-40dc-a4f1-c951a6e0b35b",
+        "systemName" : "Demovfw",
+        "lastUpdaterUserId" : "cs0008",
+        "highestVersion" : true,
+        "creatorFullName" : "Carlos Santana",
+        "allArtifacts" : { },
+        "creatorUserId" : "cs0008",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "name" : "demoVFW"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
+          "name" : "Network L1-3",
+          "normalizedName" : "network l1-3",
+          "uniqueId" : "serviceNewCategory.network l1-3"
+        } ],
+        "componentInstancesRelations" : [ ],
+        "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "1.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
+        "projectCode" : "123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "network_l_1-3",
+        "creationDate" : 1509341524624,
+        "version" : "0.1",
+        "description" : "catalog service description",
+        "tags" : [ "robot-ete", "a6484bba-671f-49c2-92fc" ],
+        "uniqueId" : "d2df45ed-89c1-4d23-a605-bae03ee1f14f",
+        "normalizedName" : "a6484bba671f49c292fc",
+        "invariantUUID" : "566c6ab2-f32e-4022-acd3-cf2bf17ae6fc",
+        "lastUpdateDate" : 1509341524624,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
+        "uuid" : "990bec96-b359-48e1-8f1f-742739a95579",
+        "systemName" : "A6484bba671f49c292fc",
+        "lastUpdaterUserId" : "cs0008",
+        "highestVersion" : true,
+        "creatorFullName" : "Carlos Santana",
+        "allArtifacts" : { },
+        "creatorUserId" : "cs0008",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "name" : "a6484bba-671f-49c2-92fc"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
new file mode 100644
index 00000000..e64d4efc
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
@@ -0,0 +1,24 @@
+onap_cli_sample_version: 1.0
+name: service-model-list
+version: onap-1.1
+samples:
+  sample1:
+    name: service-model-list
+    input: --long
+    moco: service-model-list-schema-1.1-moco.json
+    ouput:|
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |uuid                                  |invariant-uuid                        |name                      |version   |status                  |distribution-status         |description                   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |0f4203a8-a314-47bb-9a7d-28157652cec4  |1de901ed-17af-4b03-bc1f-41659cfa27cb  |demoVLB                   |1.0       |CERTIFIED               |DISTRIBUTED                 |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |75caf010-9f14-424d-93c4-9f8fe8be7970  |b51013b7-e2bb-4abb-8f45-8e32113264b3  |demoVFW                   |1.0       |CERTIFIED               |DISTRIBUTION_APPROVED       |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |5b054e09-9cc3-49bd-8962-e014465e295b  |3a6a08c8-9bbe-4650-a1c5-687fb1012b98  |Kanag-vFW-Service         |1.0       |CERTIFIED               |DISTRIBUTED                 |First service created.        |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |c9aa6a9c-dddd-4019-8f7b-70c09de68e96  |dd04c1c2-beb2-4b6c-997d-c94fae54fb57  |demoVCPE                  |1.0       |CERTIFIED               |DISTRIBUTED                 |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |f2a9f7e3-ead9-4585-8f5f-665acc6cff1c  |b51013b7-e2bb-4abb-8f45-8e32113264b3  |demoVFW                   |1.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      |d2df45ed-89c1-4d23-a605-bae03ee1f14f  |566c6ab2-f32e-4022-acd3-cf2bf17ae6fc  |a6484bba-671f-49c2-92fc   |0.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |catalog service description   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+