Fix catalog API inconsistency with code

[vfc/nfvo/lcm.git] / lcm / swagger / vfc.vnfdriver.swagger.json

diff --git a/lcm/swagger/vfc.vnfdriver.swagger.json b/lcm/swagger/vfc.vnfdriver.swagger.json
index d1db684..a2b37f3 100644 (file)
--- a/lcm/swagger/vfc.vnfdriver.swagger.json
+++ b/lcm/swagger/vfc.vnfdriver.swagger.json
@@ -693,49 +693,17 @@
         "vim": {
           "type": "object",
           "properties": {
-            "vimInfoId": {
-              "type": "string"
-            },
-            "vimId": {
+            "vimid": {
               "type": "string"
             },
-            "interfaceInfo": {
-              "type": "object",
-              "properties": {
-                "vimType": {
-                  "type": "string",
-                  "description": "The vim Type value wil be openstack"
-                },
-                "apiVersion": {
-                  "type": "string",
-                  "description": "The api Version Type value will be "
-                },
-                "protocolType": {
-                  "type": "string",
-                  "description": "The protocol Type value will be http or https"
-                }
-              }
-            },
-            "accessInfo": {
+            "accessinfo": {
               "type": "object",
               "properties": {
                 "tenant": {
                   "type": "string",
                   "description": "Tenant Name of tenant"
-                },
-                "username": {
-                  "type": "string",
-                  "description": "Username for login"
-                },
-                "password": {
-                  "type": "string",
-                  "description": "Password of login user"
                 }
               }
-            },
-            "interfaceEndpoint": {
-              "type": "string",
-              "description": "Information about the interface endpoint. It is a URL"
             }
           }
         }
@@ -1187,9 +1155,13 @@
       "type": "object",
       "description": "vnf package infomation",
       "properties": {
-        "csarId": {
+        "vnfPackageId": {
           "type": "string",
-          "description": "vnf package id, UUID"
+          "description": "vnf package id (csarId)"
+        },
+        "csarName": {
+          "type": "string",
+          "description": "The name of the csar"
         },
         "vnfdId": {
           "type": "string",
@@ -1199,6 +1171,10 @@
           "type": "string",
           "description": "VNF descriptor vendor ID"
         },
+        "vnfdModel": {
+          "type": "string",
+          "description": "The model of the VNF (JSON) encoded to string"
+        },
         "vnfdVersion": {
           "type": "string",
           "description": "VNF descriptor version"
@@ -1207,9 +1183,9 @@
           "type": "string",
           "description": "VNF Software version"
         },
-        "downloadUri":{
+        "downloadUrl":{
           "type": "string",
-          "description": "The download uri of VNF package"
+          "description": "The URL from which the VNF package can be downloaded"
         }
       }
     },