Update listing of service model samples

CLI-57

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

2 files changed, 198 insertions, 66 deletions

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
index fc826953..d5745217 100644
--- 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
@@ -7,7 +7,7 @@
       "X-FromAppId" : "onap-cli",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-9f8a725b-ac09-479a-9d73-8d9d9c7a4a86",
+      "X-TransactionId" : "req-a5e3907c-e989-40de-8659-ca72e768e7d8",
       "Content-Type" : "application/json"
     },
     "json" : null
@@ -130,6 +130,55 @@
         } ],
         "componentInstancesRelations" : [ ],
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.VF",
+        "derivedFromGenericVersion" : "2.0",
+        "toscaType" : "topology_template",
+        "abstract" : false,
+        "resourceType" : "VF",
+        "toscaResourceName" : "org.openecomp.resource.vf.KanagCliVlb",
+        "vendorName" : "Kanag-cli",
+        "vendorRelease" : "1.0",
+        "resourceVendorModelNumber" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1509603052084,
+        "version" : "1.0",
+        "description" : "VF created from CLI",
+        "tags" : [ "CLI", "kanag-cli-VLB" ],
+        "uniqueId" : "828be6cf-c11b-4759-ac37-b1b79f86a4b4",
+        "normalizedName" : "kanagclivlb",
+        "invariantUUID" : "2d455337-57eb-4edf-a8b9-9f87fd85bc0e",
+        "lastUpdateDate" : 1509603385031,
+        "componentType" : "RESOURCE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "46c89121-b37f-4192-8841-25c93165b843",
+        "systemName" : "KanagCliVlb",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "csarUUID" : "f19cad8343794e93acb9cda2e4126281",
+        "csarVersion" : "2.0",
+        "importedToscaChecksum" : "NDQzNmIwOWE1NjQ2NjU2YTNkMWVmNzcxMTczMjRmNDE=",
+        "name" : "kanag-cli-VLB"
+      }, {
+        "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,
@@ -281,55 +330,6 @@
         "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",
@@ -461,6 +461,48 @@
         } ],
         "componentInstancesRelations" : [ ],
         "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
+        "derivedFromGenericVersion" : "2.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
+        "projectCode" : "kanag-123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1509596499859,
+        "version" : "0.1",
+        "description" : "vLB created from CLI",
+        "tags" : [ "CLI", "kanagVLB" ],
+        "uniqueId" : "5ca7c6cb-78dc-4cf5-ab02-52c9ffb8c884",
+        "normalizedName" : "kanagvlb",
+        "invariantUUID" : "9288833a-5dd6-4f9d-84ff-b34de06011c6",
+        "lastUpdateDate" : 1509596499859,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
+        "uuid" : "77863a62-65b3-432c-8238-e66af16d087c",
+        "systemName" : "Kanagvlb",
+        "lastUpdaterUserId" : "cs0008",
+        "highestVersion" : true,
+        "creatorFullName" : "Carlos Santana",
+        "allArtifacts" : { },
+        "creatorUserId" : "cs0008",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "name" : "kanagVLB"
+      }, {
+        "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" : { },
@@ -497,6 +539,90 @@
         "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" : "2.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
+        "projectCode" : "kanag-123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1509596401791,
+        "version" : "0.1",
+        "description" : "vLB created from CLI",
+        "tags" : [ "CLI", "vLB-kanag" ],
+        "uniqueId" : "fa9d6078-2d59-4c03-b97e-b57436680513",
+        "normalizedName" : "vlbkanag",
+        "invariantUUID" : "5790901b-c109-4fc3-947a-ab71aa064251",
+        "lastUpdateDate" : 1509596401791,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
+        "uuid" : "d5e7e515-355b-406e-b103-ba8293b8f4b4",
+        "systemName" : "VlbKanag",
+        "lastUpdaterUserId" : "cs0008",
+        "highestVersion" : true,
+        "creatorFullName" : "Carlos Santana",
+        "allArtifacts" : { },
+        "creatorUserId" : "cs0008",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Carlos Santana",
+        "name" : "vLB-kanag"
+      }, {
+        "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" : "2.0",
+        "toscaType" : "topology_template",
+        "serviceApiArtifacts" : { },
+        "distributionStatus" : "DISTRIBUTION_APPROVED",
+        "projectCode" : "kanag-123456",
+        "ecompGeneratedNaming" : true,
+        "namingPolicy" : "",
+        "serviceType" : "",
+        "serviceRole" : "",
+        "icon" : "defaulticon",
+        "creationDate" : 1509606274213,
+        "version" : "1.0",
+        "description" : "VLB created from CLI",
+        "tags" : [ "CLI", "kanag-cli-VLB" ],
+        "uniqueId" : "ba5a19b1-3219-4f30-bfd3-3b2f700c0157",
+        "normalizedName" : "kanagclivlb",
+        "invariantUUID" : "c4425f23-fc9a-4cbf-a3b7-12e69054806b",
+        "lastUpdateDate" : 1509606990442,
+        "componentType" : "SERVICE",
+        "lifecycleState" : "CERTIFIED",
+        "uuid" : "660c524c-176b-43b1-a85b-1ef18011ca85",
+        "systemName" : "KanagCliVlb",
+        "lastUpdaterUserId" : "jm0007",
+        "highestVersion" : true,
+        "creatorFullName" : "Joni Mitchell",
+        "allArtifacts" : { },
+        "creatorUserId" : "jm0007",
+        "contactId" : "cs0008",
+        "conformanceLevel" : "4.0",
+        "lastUpdaterFullName" : "Joni Mitchell",
+        "name" : "kanag-cli-VLB"
+      }, {
+        "artifacts" : { },
+        "deploymentArtifacts" : { },
+        "toscaArtifacts" : { },
+        "categories" : [ {
           "name" : "Network L4+",
           "normalizedName" : "network l4+",
           "uniqueId" : "serviceNewCategory.network l4+"
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
index aa614e1b..032d24a5 100644
--- 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
@@ -4,21 +4,27 @@ version: onap-1.1
 samples:
   sample1:
     name: service-model-list
-    input: --long
+    input:
     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   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |uuid                                  |invariant-uuid                        |name                      |version   |status                  |distribution-status         |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |0f4203a8-a314-47bb-9a7d-28157652cec4  |1de901ed-17af-4b03-bc1f-41659cfa27cb  |demoVLB                   |1.0       |CERTIFIED               |DISTRIBUTED                 |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |5ca7c6cb-78dc-4cf5-ab02-52c9ffb8c884  |9288833a-5dd6-4f9d-84ff-b34de06011c6  |kanagVLB                  |0.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |75caf010-9f14-424d-93c4-9f8fe8be7970  |b51013b7-e2bb-4abb-8f45-8e32113264b3  |demoVFW                   |1.0       |CERTIFIED               |DISTRIBUTION_APPROVED       |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |fa9d6078-2d59-4c03-b97e-b57436680513  |5790901b-c109-4fc3-947a-ab71aa064251  |vLB-kanag                 |0.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |ba5a19b1-3219-4f30-bfd3-3b2f700c0157  |c4425f23-fc9a-4cbf-a3b7-12e69054806b  |kanag-cli-VLB             |1.0       |CERTIFIED               |DISTRIBUTION_APPROVED       |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |5b054e09-9cc3-49bd-8962-e014465e295b  |3a6a08c8-9bbe-4650-a1c5-687fb1012b98  |Kanag-vFW-Service         |1.0       |CERTIFIED               |DISTRIBUTED                 |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |c9aa6a9c-dddd-4019-8f7b-70c09de68e96  |dd04c1c2-beb2-4b6c-997d-c94fae54fb57  |demoVCPE                  |1.0       |CERTIFIED               |DISTRIBUTED                 |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |f2a9f7e3-ead9-4585-8f5f-665acc6cff1c  |b51013b7-e2bb-4abb-8f45-8e32113264b3  |demoVFW                   |1.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+      |d2df45ed-89c1-4d23-a605-bae03ee1f14f  |566c6ab2-f32e-4022-acd3-cf2bf17ae6fc  |a6484bba-671f-49c2-92fc   |0.1       |NOT_CERTIFIED_CHECKOUT  |DISTRIBUTION_NOT_APPROVED   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+