Add VSP to vf-model-list

CLI-57

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

3 files changed, 32 insertions, 24 deletions

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml
index e43ff9c8..8ad3656e 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml
@@ -35,7 +35,14 @@ results:
       description: description
       type: string
       scope: long
-
+    - name: vsp-uuid
+      description: VSP uuid
+      type: string
+      scope: long
+    - name: vsp-version
+      description: VSP version
+      type: string
+      scope: long
 http:
   request:
     uri: /sdc2/rest/v1/followed
@@ -49,4 +56,5 @@ http:
     name: $b{resources.[*].name}
     status: $b{resources.[*].lifecycleState}
     description: $b{resources.[*].description}
-
+    vsp-uuid: $b{resources.[*].csarUUID}
+    vsp-version: $b{resources.[*].csarVersion}
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json
index 8b19a3c0..0e616302 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json
@@ -7,7 +7,7 @@
       "X-FromAppId" : "onap-cli",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-60f8b79d-2d54-4f76-a004-1de0a5f42deb",
+      "X-TransactionId" : "req-49876ad8-7b10-4273-8ece-853e4f773dd6",
       "Content-Type" : "application/json"
     },
     "json" : null
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
index 5dc8d17a..ce3ddf7f 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
@@ -4,25 +4,25 @@ version: onap-1.1
 samples:
   sample1:
     name: vf-model-list
-    input: --long
+    input:
     moco: vf-model-list-schema-1.1-moco.json
-    ouput: |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |uuid                                  |invariant-uuid                        |name                      |version   |status                  |description                 |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |dac5b070-e53b-44b3-8034-46c9cf797de3  |d3d50449-a81a-497f-97b3-4eb770ea67e7  |Kanag-VSP                 |1.0       |CERTIFIED               |Test VSP created by Kanag   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |047b9ff8-2414-45b7-b753-26342369f160  |cc34cd54-dd7c-44cd-8847-f9577c6f1a49  |847cb26a-59a6-475a-94dd   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |6e29f979-6f36-4c0d-8605-e59da8d62cb7  |1bd7f899-01dc-4d7f-97d8-f38ba6b40dd9  |74361ede-ef8c-43f1-9d82   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |3a3fb778-1c0e-41a1-9a04-f7ddaaf93d73  |414da4ea-e482-4ed2-9941-bd90108376fa  |136ab241-88ff-443a-88e8   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |f4be1629-c9a1-4f32-8f34-11eddabffc13  |7fd3788f-a065-4270-bb95-852eae3a94b3  |ef35d3c9-a8c6-457c-a115   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |13d537e4-86c9-4437-88a4-e21f135335bb  |d3d50449-a81a-497f-97b3-4eb770ea67e7  |Kanag-VSP                 |1.1       |NOT_CERTIFIED_CHECKOUT  |Test VSP created by Kanag   |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |372e2c66-ee59-4488-a6a6-546c28b3a151  |244b380b-acf1-4545-8d35-d6d01bc32fd6  |5d11dda4-fb32-4df6-86eb   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
-      |23018f7f-fbce-479e-a77b-6b98ebf03266  |6bc22345-395d-4358-8954-45963761f968  |8fd2e5c8-981d-4a14-ba77   |1.0       |CERTIFIED               |vendor software product     |
-      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
+    ouput:|
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |uuid                                  |invariant-uuid                        |name                      |version   |status                  |vsp-uuid                          |vsp-version   |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |dac5b070-e53b-44b3-8034-46c9cf797de3  |d3d50449-a81a-497f-97b3-4eb770ea67e7  |Kanag-VSP                 |1.0       |CERTIFIED               |b1caa2ec31ba4b738cbe5aab362b35aa  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |047b9ff8-2414-45b7-b753-26342369f160  |cc34cd54-dd7c-44cd-8847-f9577c6f1a49  |847cb26a-59a6-475a-94dd   |1.0       |CERTIFIED               |a8cd007fa101470e98516cd4549c568f  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |6e29f979-6f36-4c0d-8605-e59da8d62cb7  |1bd7f899-01dc-4d7f-97d8-f38ba6b40dd9  |74361ede-ef8c-43f1-9d82   |1.0       |CERTIFIED               |c212437049004e74b4ef0afb25ba41b8  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |3a3fb778-1c0e-41a1-9a04-f7ddaaf93d73  |414da4ea-e482-4ed2-9941-bd90108376fa  |136ab241-88ff-443a-88e8   |1.0       |CERTIFIED               |5f5121f701df4fe588c966002a342fdf  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |f4be1629-c9a1-4f32-8f34-11eddabffc13  |7fd3788f-a065-4270-bb95-852eae3a94b3  |ef35d3c9-a8c6-457c-a115   |1.0       |CERTIFIED               |03774c7cfcac4054bdab346142214533  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |13d537e4-86c9-4437-88a4-e21f135335bb  |d3d50449-a81a-497f-97b3-4eb770ea67e7  |Kanag-VSP                 |1.1       |NOT_CERTIFIED_CHECKOUT  |b1caa2ec31ba4b738cbe5aab362b35aa  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |372e2c66-ee59-4488-a6a6-546c28b3a151  |244b380b-acf1-4545-8d35-d6d01bc32fd6  |5d11dda4-fb32-4df6-86eb   |1.0       |CERTIFIED               |54bc478b7a9847db82156edad5d1f79f  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+
+      |23018f7f-fbce-479e-a77b-6b98ebf03266  |6bc22345-395d-4358-8954-45963761f968  |8fd2e5c8-981d-4a14-ba77   |1.0       |CERTIFIED               |0cefd6ef5ad84d2995d66d0a24d2e92e  |1.0           |
+      +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+