Merge "Fix grant response on API"

[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 068ecc9..54d8f64 100644 (file)
--- a/lcm/swagger/vfc.vnfdriver.swagger.json
+++ b/lcm/swagger/vfc.vnfdriver.swagger.json
@@ -345,7 +345,7 @@
         }
       }
     },
-    "/nslcm/v1/vnfs/{vnfInstanceId}/Notify": {
+    "/nslcm/v1/ns/{vnfmid}/vnfs/{vnfInstanceId}/Notify": {
       "post": {
         "tags": [
           "NSLCM"
@@ -354,6 +354,13 @@
         "description": "VNF LCM Notification API should be provided by NSLCM component",
         "operationId": "VNF_LCM_Notification",
         "parameters": [
+          {
+            "required": true,
+            "type": "string",
+            "description": "VNFM Instance Id",
+            "name": "vnfmid",
+            "in": "path"
+          },
           {
             "required": true,
             "type": "string",
@@ -461,7 +468,7 @@
         }
       }
     },
-    "/nslcm/vl/vnfms/{vnfmid}":{
+    "/nslcm/v1/vnfms/{vnfmid}":{
       "get": {
         "tags": [
           "NSLCM"
@@ -500,7 +507,7 @@
         }
       }
     },
-    "/nslcm/vl/vims/{vimid}":{
+    "/nslcm/v1/vims/{vimid}":{
       "get": {
         "tags": [
           "NSLCM"
@@ -561,6 +568,17 @@
         }
       }
     },
+    "JobStatus" : {
+      "description": "The status of the job",
+      "type": "string",
+      "enum": [
+        "started",
+        "processing",
+        "finished",
+        "error",
+        "timeout"
+      ]
+    },
     "JobDetailInfo": {
       "type": "object",
       "properties": {
@@ -571,13 +589,16 @@
           "type": "object",
           "properties": {
             "status": {
-              "type": "string"
+              "$ref": "#/definitions/JobStatus",
+              "description": "The status of the job"
             },
             "progress": {
-              "type": "string"
+              "type": "string",
+              "description": "The progress of the job. Value between 0 and 100."
             },
             "statusDescription": {
-              "type": "string"
+              "type": "string",
+              "description": "The reason of the current status of the job."
             },
             "errorCode": {
               "type": "string"
@@ -595,17 +616,26 @@
         }
       }
     },
+    "ChangeType" : {
+      "description": "The type of the change",
+      "type": "string",
+      "enum": [
+        "VDU"
+      ]
+    },
     "ResourceChange" : {
        "type": "object",
        "properties": {
          "type": {
-           "type": "string",
-           "description": " The value should be VDU,VL,CP,Strorage."
+           "$ref": "#/definitions/ChangeType",
+           "description": "The type of the resource."
          },
          "resourceDefinitionId": {
+           "description": "The identifier of the resource within the grant request.",
            "type": "string"
          },
          "vdu": {
+           "description": "The identifier of the VDU.",
            "type": "string"
          }
        }
@@ -663,49 +693,17 @@
         "vim": {
           "type": "object",
           "properties": {
-            "vimInfoId": {
+            "vimid": {
               "type": "string"
             },
-            "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"
             }
           }
         }
@@ -1319,7 +1317,7 @@
         },
         "sslCacert": {
           "type": "string",
-          "description": "CA file content if enabled ssl on auth-url"         
+          "description": "The collection of trusted certificates towards the VIM connection."
         },
         "sslInsecure": {
           "type": "string",