modify VIM and VNFM swagger

[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 9359cc9..49f74cd 100644 (file)
--- a/lcm/swagger/vfc.vnfdriver.swagger.json
+++ b/lcm/swagger/vfc.vnfdriver.swagger.json
@@ -461,7 +461,7 @@
         }
       }
     },
-    "/nslcm/vl/vnfms/{vnfmid}":{
+    "/nslcm/v1/vnfms/{vnfmid}":{
       "get": {
         "tags": [
           "NSLCM"
@@ -500,7 +500,7 @@
         }
       }
     },
-    "/nslcm/vl/vims/{vimid}":{
+    "/nslcm/v1/vims/{vimid}":{
       "get": {
         "tags": [
           "NSLCM"
@@ -610,6 +610,19 @@
          }
        }
     },
+    "OperationType" : {
+      "description": "The type of operation",
+      "type": "string",
+      "enum": [
+        "Terminal",
+        "Instantiate",
+        "Scalein",
+        "Scaleout",
+        "Scaledown",
+        "Scaleup",
+        "Heal"
+      ]
+    },
     "GrantVNFRequest": {
       "type": "object",
       "properties": {
@@ -620,8 +633,8 @@
           "type": "string"
         },
         "lifecycleOperation": {
-          "type": "string",
-          "description": "The value should be Instantiate,Scaleout,Scalein,Scaleup,Scaledown, Heal, Terminal"
+          "description" : "The type of the operation.",
+          "$ref": "#/definitions/OperationType"
         },
         "jobId": {
           "type": "string"
@@ -674,7 +687,7 @@
               }
             },
             "accessInfo": {
-              "type": "string",
+              "type": "object",
               "properties": {
                 "tenant": {
                   "type": "string",
@@ -850,19 +863,30 @@
     "AffectedVirtualStorage" : {
        "type": "object"
      },
-    "VNFLCMNotification": {
+   "VnfLcmNotificationStatus" : {
+      "description": "The status of the operation",
+      "type": "string",
+      "enum": [
+        "result",
+        "start"
+      ]
+    },
+   "VNFLCMNotification": {
       "type": "object",
       "properties": {
         "status": {
-          "type": "string"
+          "description" : "The status of the operation that triggered the LCN.",
+          "$ref": "#/definitions/VnfLcmNotificationStatus"
         },
         "vnfInstanceId": {
           "type": "string"
         },
         "operation": {
-          "type": "string"
+          "description" : "The type of the operation that tiggered the LCN.",
+          "$ref": "#/definitions/OperationType"
         },
         "jobId": {
+          "description" : "The identifier fo the job that triggered the LCN.",
           "type": "string"
         },
         "affectedVnfc": {
@@ -950,12 +974,20 @@
         }
       }
     },
+    "ScaleDirection" : {
+      "description": "The direction of the scaling",
+      "type": "string",
+      "enum": [
+        "SCALE_IN",
+        "SCALE_OUT"
+      ]
+    },
     "VnfScaleRequest":{
       "type": "object",
       "properties": {
         "type": {
-          "type": "string",
-          "description": "The VNF scale type value should be SCALE_OUT, SCALE_IN"
+          "description" : "The direction of the scaling.",
+          "$ref": "#/definitions/ScaleDirection"
         },
         "aspectId":{
           "type": "string",
@@ -993,15 +1025,25 @@
         }
       }
     },
+    "VnfTerminationType": {
+      "description": "The type of the termination.",
+      "type": "string",
+      "enum": [
+        "graceful",
+        "forceful"
+      ]
+    },
     "VnfTerminateRequest":{
       "type": "object",
       "properties": {
         "terminationType": {
-          "type": "string"
+          "description" : "The type of the termination",
+          "$ref": "#/definitions/VnfTerminationType"
         },
         "gracefulTerminationTimeout": {
+          "description": "The time interval(second) to wait for the VNF to be taken out of service during graceful termination.",
           "type": "string"
-        }        
+        }
       }      
     },
     "JobInfo": {
@@ -1071,7 +1113,7 @@
               }
             },
             "accessInfo": {
-              "type": "string",
+              "type": "object",
               "properties": {
                 "tenant": {
                   "type": "string",
@@ -1241,23 +1283,23 @@
         },
         "name": {
           "type": "string",
-          "description": "vnfm name"
+          "description": "vim name"
         },
         "type": {
           "type": "string",
-          "description": "vnfm type"
+          "description": "vim type"
         },  
         "url": {
           "type": "string",
-          "description": "vnfm url"
+          "description": "vim url"
         },
         "userName": {
           "type": "string",
-          "description": "vnfm login username"
+          "description": "vim login username"
         },
         "password": {
           "type": "string",
-          "description": "vnfm login password"
+          "description": "vim login password"
         },  
         "vendor": {
           "type": "string",
@@ -1265,15 +1307,27 @@
         },
         "version": {
           "type": "string",
-          "description": "vnfm version"
+          "description": "vim version"
         }, 
         "description": {
           "type": "string",
-          "description": "vnfm description"
+          "description": "vim description"
         }, 
         "createTime": {
           "type": "string",
-          "description": "vnfm info createTime"
+          "description": "vim info createTime"
+        },
+        "sslCacert": {
+          "type": "string",
+          "description": "CA file content if enabled ssl on auth-url"         
+        },
+        "sslInsecure": {
+          "type": "string",
+          "description": "Whether to verify VIM's certificate"         
+        },
+        "status": {
+          "type": "string",
+          "description": "The status of external system"
         }
       }      
     }