Fix issue in swagger.json

Change-Id: Ibdf2055e54fa289c8b342efa49dfa2ac3dafb1b7
Issue-Id: MULTIVIM-16
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
index 85e3321..2053e03 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
@@ -94,13 +94,25 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim flavors request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "flavor name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimFlavors"
-                        }
+                        "type": "string"
+                    },
+                    {
+                        "name": "limit",
+                        "in":  "query",
+                        "description": "Requests a page size of items",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "marker",
+                        "in":  "query",
+                        "description": "image ID of the last-seen item",
+                        "required": false,
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -281,23 +293,6 @@
                 }
             }
         },
-        "ListVimFlavors": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "flavor name to filter flavor list"
-                },
-                "limit": {
-                    "type": "integer",
-                    "description": "Requests a page size of items"
-                },
-                "marker": {
-                    "type": "string",
-                    "description": "flavor ID of the last-seen item"
-                }
-            }
-        },
         "VimFlavorsInfo": {
             "type": "object",
             "required": [

diff --git a/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
index 828aed4..e04b526 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
@@ -39,15 +39,6 @@
                         "description": "tenant UUID",
                         "required": true,
                         "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim hosts request param",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimHosts"
-                        }
                     }
                 ],
                 "responses": {
@@ -107,7 +98,7 @@
                     "200": {
                         "description": "successful operation",
                         "schema": {
-                            "$ref": "#/definitions/VimHostInfo"
+                            "$ref": "#/definitions/VimHostDetail"
                         }
                     },
                     "404": {
@@ -178,6 +169,65 @@
                     "description": "tenant UUID"
                 }
             }
+        },
+        "VimHostDetail": {
+            "type": "object",
+            "required": [
+                "vimId",
+                "tenantId",
+                "host"
+            ],
+            "properties": {
+                "host": {
+                    "type": "array",
+                    "description": "list of host information",
+                    "items": {
+                       "$ref": "#/definitions/VimHostResource"
+                    }
+                },
+                "vimId": {
+                    "type": "string"
+                },
+                "vimName": {
+                    "type": "string"
+                },
+                "tenantId": {
+                    "type": "string",
+                    "description": "tenant UUID"
+                }
+            }
+        },
+        "VimHostResource": {
+            "type": "object",
+            "required": [
+                "name",
+                "cpu",
+                "memory_mb",
+                "disk_gb",
+                "project"
+            ],
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "description": "host name"
+                },
+                "cpu": {
+                    "type": "integer",
+                    "description": "The cpu info on the host"
+                },
+                "memory_mb": {
+                    "type": "integer",
+                    "description": "The memory info on the host (in MB)"
+                },
+                "disk_gb": {
+                    "type": "integer",
+                    "description": "The disk info on the host (in GB)"
+                },
+                "project": {
+                    "type": "string",
+                    "description": "The project id (or special name like total, used_now, used_max)."
+                }
+            }
         }
     }
 }

diff --git a/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
index ece3c0d..dcbba06 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
@@ -94,13 +94,25 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim images request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "images name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimImages"
-                        }
+                        "type": "string"
+                    },
+                    {
+                        "name": "limit",
+                        "in":  "query",
+                        "description": "Requests a page size of items",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "marker",
+                        "in":  "query",
+                        "description": "image ID of the last-seen item",
+                        "required": false,
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -250,43 +262,6 @@
                 "visibility": {
                     "type": "string",
                     "description": "public, private, shared, or community"
-                },
-                "properties": {
-                    "type": "array",
-                    "description": "list of properties",
-                    "items": {
-                       "$ref": "#/definitions/VimImagePropertyInfo"
-                    }
-                }
-            }
-        },
-        "VimImagePropertyInfo": {
-            "type": "object",
-            "properties": {
-                "keyName": {
-                    "type": "string",
-                    "description": "property name"
-                },
-                "value": {
-                    "type": "string",
-                    "description": "property value"
-                }
-            }
-        },
-        "ListVimImages": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "image name to filter image list"
-                },
-                "limit": {
-                    "type": "string",
-                    "description": "Requests a page size of items"
-                },
-                "marker": {
-                    "type": "string",
-                    "description": "image ID of the last-seen item"
                 }
             }
         },

diff --git a/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
index 9d9bd32..92794d6 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
@@ -94,13 +94,11 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim networks request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "network name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimNetworks"
-                        }
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -260,15 +258,6 @@
                 }
             }
         },
-        "ListVimNetworks": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "network name"
-                }
-            }
-        },
         "VimNetworksInfo": {
             "type": "object",
             "required": [

diff --git a/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
index 27a4906..14b1d0e 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
@@ -94,13 +94,25 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim servers request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "server name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimServers"
-                        }
+                        "type": "string"
+                    },
+                    {
+                        "name": "limit",
+                        "in":  "query",
+                        "description": "Requests a page size of items",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "marker",
+                        "in":  "query",
+                        "description": "image ID of the last-seen item",
+                        "required": false,
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -350,23 +362,6 @@
                 }
             }
         },
-        "ListVimServers": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "server name to filter server list"
-                },
-                "limit": {
-                    "type": "integer",
-                    "description": "Requests a page size of items"
-                },
-                "marker": {
-                    "type": "string",
-                    "description": "server ID of the last-seen item"
-                }
-            }
-        },
         "VimServersInfo": {
             "type": "object",
             "required": [

diff --git a/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
index 9381cb0..301c0fc 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
@@ -94,13 +94,11 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim subnets request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "subnet name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimSubnets"
-                        }
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -304,15 +302,6 @@
                 }
             }
         },
-        "ListVimSubnets": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "subnet name"
-                }
-            }
-        },
         "VimSubnetsInfo": {
             "type": "object",
             "required": [

diff --git a/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
index 802285a..0f71874 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
@@ -34,13 +34,11 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim tenants request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "tenant name to filter tenant list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimTenants"
-                        }
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -61,15 +59,6 @@
         }
     },
     "definitions": {
-        "ListVimTenants": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "tenant name to filter tenant list"
-                }
-            }
-        },
         "VimTenantsInfo": {
             "type": "object",
             "required": [
@@ -106,12 +95,6 @@
                 "id": {
                     "type": "string",
                     "description": "tenant UUID"
-                },
-                "vimId": {
-                    "type": "string"
-                },
-                "vimName": {
-                    "type": "string"
                 }
             }
         }

diff --git a/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
index d22cfa4..c91deac 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
@@ -94,13 +94,25 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim volumes request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "volumn name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimVolumes"
-                        }
+                        "type": "string"
+                    },
+                    {
+                        "name": "limit",
+                        "in":  "query",
+                        "description": "Requests a page size of items",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "marker",
+                        "in":  "query",
+                        "description": "image ID of the last-seen item",
+                        "required": false,
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -251,23 +263,6 @@
                 }
             }
         },
-        "ListVimVolumes": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "volume name to filter volume list"
-                },
-                "limit": {
-                    "type": "integer",
-                    "description": "Requests a page size of items"
-                },
-                "marker": {
-                    "type": "string",
-                    "description": "volume ID of the last-seen item"
-                }
-            }
-        },
         "VimVolumesInfo": {
             "type": "object",
             "required": [
@@ -334,6 +329,10 @@
                        "$ref": "#/definitions/VimVolumeAttachmentInfo"
                     }
                 },
+                "status": {
+                    "type": "string",
+                    "description": "volume status"
+                },
                 "vimId": {
                     "type": "string"
                 },
@@ -365,9 +364,9 @@
                     "type": "string",
                     "description": "volume UUID"
                 },
-                "deviceId": {
+                "device": {
                     "type": "string",
-                    "description": "device UUID"
+                    "description": "device to be attached"
                 },
                 "hostName": {
                     "type": "string",

diff --git a/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
index b78f1a1..5a70dfb 100644 (file)
--- a/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
@@ -94,13 +94,11 @@
                         "type": "string"
                     },
                     {
-                        "in": "body",
-                        "name": "body",
-                        "description": "get a list of vim virtual ports request param",
+                        "name": "name",
+                        "in":  "query",
+                        "description": "virtual port name to filter list",
                         "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ListVimPorts"
-                        }
+                        "type": "string"
                     }
                 ],
                 "responses": {
@@ -226,10 +224,7 @@
             "type": "object",
             "required": [
                 "networkId",
-                "subnetId",
-                "name",
-                "cidr",
-                "ipVersion"
+                "name"
             ],
             "properties": {
                 "networkId": {
@@ -265,15 +260,6 @@
                 }
             }
         },
-        "ListVimPorts": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string",
-                    "description": "virtual port name"
-                }
-            }
-        },
         "VimPortsInfo": {
             "type": "object",
             "required": [
@@ -307,8 +293,7 @@
                 "name",
                 "status",
                 "id",
-                "networkId",
-                "subnetId"
+                "networkId"
             ],
             "properties": {
                 "name": {