From 8e6941238166250c8366063db0d48acf06415f73 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 31 Oct 2017 18:19:17 +0530
Subject: Add VSP to vf2module list

CLI-57

Change-Id: I0955ff8f6d7146e375eeaf5248db66344146207d
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 .../vf/vf2vfmodule-model-list-schema-1.1.yaml            | 10 ++++++++++
 .../vf/vf2vfmodule-model-list-schema-1.1-moco.json       |  2 +-
 .../vf/vf2vfmodule-model-list-schema-1.1-sample.yaml     | 16 ++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
index a4092d41..a138363f 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
@@ -19,6 +19,14 @@ parameters:
 results:
   direction: landscape
   attributes:
+    - name: vsp-uuid
+      description: VSP uuid
+      type: string
+      scope: short
+    - name: vsp-version
+      description: VSP version
+      type: string
+      scope: short
     - name: module-uuid
       description: UUID
       type: string
@@ -47,3 +55,5 @@ http:
     module-name: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].name}
     module-version: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].version}
     module-invariant-uuid: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].invariantUUID}
+    vsp-uuid: $b{$.csarUUID}
+    vsp-version: $b{$.csarVersion}
\ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
index 33cc69c5..b8768412 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
@@ -7,7 +7,7 @@
       "X-FromAppId" : "onap-cli",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-16f85bde-c0ba-411e-b020-9230cc67c1c5",
+      "X-TransactionId" : "req-6d1108d4-8ec3-477e-8808-1fb0cf789f13",
       "Content-Type" : "application/json"
     },
     "json" : null
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
index b0888c19..2ae060e4 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
@@ -6,11 +6,11 @@ samples:
     name: vf2vfmodule-model-list
     input: --vf-id 047b9ff8-2414-45b7-b753-26342369f160
     moco: vf2vfmodule-model-list-schema-1.1-moco.json
-    ouput: |
-      +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
-      |module-uuid                           |module-invariant-uuid                 |module-name                                 |module-version  |
-      +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
-      |2110b26d-4db0-4445-b059-f1abcd4f9995  |782fda23-6885-48ed-959c-d2704862882e  |847cb26a59a6475a94dd..dnsscaling..module-1  |1               |
-      +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
-      |753140fc-a0b5-478b-ad33-9f883204ab82  |bcbb0793-0cd7-4f8f-b068-aa22b40464c0  |847cb26a59a6475a94dd..base_vlb..module-0    |1               |
-      +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
+    ouput:|
+      +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
+      |vsp-uuid                          |vsp-version   |module-uuid                           |module-invariant-uuid                 |module-name                                 |module-version  |
+      +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
+      |a8cd007fa101470e98516cd4549c568f  |1.0           |2110b26d-4db0-4445-b059-f1abcd4f9995  |782fda23-6885-48ed-959c-d2704862882e  |847cb26a59a6475a94dd..dnsscaling..module-1  |1               |
+      +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
+      |                                  |              |753140fc-a0b5-478b-ad33-9f883204ab82  |bcbb0793-0cd7-4f8f-b068-aa22b40464c0  |847cb26a59a6475a94dd..base_vlb..module-0    |1               |
+      +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+
-- 
cgit 1.2.3-korg