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>

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