From b29214f3c8c3d82d229de18c49b178b88ae9750b Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Wed, 13 Dec 2017 10:26:12 +0800
Subject: Fix vfc-catalog code and API inconsistencies

Modify vfc-catalog swagger file to fix inconsistencies between catalog code and interface

Change-Id: I90627d5304a4229dedf5508b9f1311733558824f
Issue-ID: VFC-616
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 catalog/swagger/vfc.catalog.swagger.json | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/catalog/swagger/vfc.catalog.swagger.json b/catalog/swagger/vfc.catalog.swagger.json
index 6aa651b3..39e8e6ab 100644
--- a/catalog/swagger/vfc.catalog.swagger.json
+++ b/catalog/swagger/vfc.catalog.swagger.json
@@ -466,7 +466,7 @@
     "NsPkgListInfo": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/NsPkgInfo"
+        "$ref": "#/definitions/NsPkgDetailInfo"
       }
     },
     "NsPkgDetailInfo": {
@@ -475,7 +475,7 @@
         "csarId": {
           "type": "string"
         },
-        "NsPackageInfo": {
+        "packageInfo": {
           "$ref": "#/definitions/NsPkgInfo"
         },
         "NsInstanceInfo": {
@@ -486,9 +486,9 @@
     "NsPkgInfo": {
       "type": "object",
       "properties": {
-        "csarId": {
+        "nsPackageId": {
           "type": "string",
-          "description": "network service package id, UUID"
+          "description": "network service package id, UUID, csarId"
         },
         "nsdId": {
           "type": "string",
@@ -501,6 +501,18 @@
         "nsdVersion": {
           "type": "string",
           "description": "network service descriptor version"
+        },
+        "csarName": {
+          "type": "string",
+          "description": "network service package name"
+        },
+        "nsdModel": {
+          "type": "string",
+          "description": "ns JSON string parsed and transformed by parser"
+        },
+        "downloadUrl": {
+          "type": "string",
+          "description": "download url of network service package"
         }
       }
     },
@@ -561,7 +573,7 @@
     "VnfPkgListInfo": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/VnfPkgInfo"
+        "$ref": "#/definitions/VnfPkgDetailInfo"
       }
     },
     "VnfPkgDetailInfo": {
-- 
cgit 1.2.3-korg