Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dragonflyoss/Dragonfly2 into featur…
Browse files Browse the repository at this point in the history 
…e/manager-v2

Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
@gaius-qi
gaius-qi committed Jan 10, 2023
2 parents cbde2f8 + da0cf8d commit 6479dd9
Show file tree
Hide file tree
Showing 47 changed files with 942 additions and 683 deletions.
127 changes: 65 additions & 62 deletions api/manager/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ const docTemplate = `{
}
}
},
"/roles/:role": {
"/roles/{role}": {
"get": {
"description": "Get Role",
"consumes": [
Expand Down Expand Up @@ -1361,7 +1361,7 @@ const docTemplate = `{
}
}
},
"/roles/:role/permissions": {
"/roles/{role}/permissions": {
"post": {
"description": "Add Permission by json config",
"consumes": [
Expand Down Expand Up @@ -2115,11 +2115,9 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
}
},
"/schedulers/{id}/models/{model_id}/versions": {
"get": {
"description": "Get Model Versions by id",
},
"patch": {
"description": "Update by json config",
"consumes": [
"application/json"
],
Expand All @@ -2129,7 +2127,7 @@ const docTemplate = `{
"tags": [
"Model"
],
"summary": "Get Model Versions",
"summary": "Update Model",
"parameters": [
{
"type": "string",
Expand All @@ -2144,16 +2142,22 @@ const docTemplate = `{
"name": "model_id",
"in": "path",
"required": true
},
{
"description": "Model",
"name": "Model",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.UpdateModelRequest"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.ModelVersion"
}
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.Model"
}
},
"400": {
Expand All @@ -2166,9 +2170,11 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
},
"post": {
"description": "Create by id",
}
},
"/schedulers/{id}/models/{model_id}/versions": {
"get": {
"description": "Get Model Versions by id",
"consumes": [
"application/json"
],
Expand All @@ -2178,7 +2184,7 @@ const docTemplate = `{
"tags": [
"Model"
],
"summary": "Create Model Version",
"summary": "Get Model Versions",
"parameters": [
{
"type": "string",
Expand All @@ -2193,22 +2199,16 @@ const docTemplate = `{
"name": "model_id",
"in": "path",
"required": true
},
{
"description": "ModelVersion",
"name": "ModelVersion",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.CreateModelVersionRequest"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.ModelVersion"
"type": "array",
"items": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.ModelVersion"
}
}
},
"400": {
Expand All @@ -2221,11 +2221,9 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
}
},
"/schedulers/{id}/models/{model_id}/versions/{version_id}": {
"get": {
"description": "Get Model Version by id",
},
"post": {
"description": "Create by id",
"consumes": [
"application/json"
],
Expand All @@ -2235,7 +2233,7 @@ const docTemplate = `{
"tags": [
"Model"
],
"summary": "Get Model Version",
"summary": "Create Model Version",
"parameters": [
{
"type": "string",
Expand All @@ -2252,11 +2250,13 @@ const docTemplate = `{
"required": true
},
{
"type": "string",
"description": "version_id",
"name": "version_id",
"in": "path",
"required": true
"description": "ModelVersion",
"name": "ModelVersion",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.CreateModelVersionRequest"
}
}
],
"responses": {
Expand All @@ -2276,9 +2276,11 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
},
"delete": {
"description": "Destroy by id",
}
},
"/schedulers/{id}/models/{model_id}/versions/{version_id}": {
"get": {
"description": "Get Model Version by id",
"consumes": [
"application/json"
],
Expand All @@ -2288,7 +2290,7 @@ const docTemplate = `{
"tags": [
"Model"
],
"summary": "Destroy Model Version",
"summary": "Get Model Version",
"parameters": [
{
"type": "string",
Expand All @@ -2314,7 +2316,10 @@ const docTemplate = `{
],
"responses": {
"200": {
"description": "OK"
"description": "OK",
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.ModelVersion"
}
},
"400": {
"description": "Bad Request"
Expand All @@ -2326,11 +2331,9 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
}
},
"/schedulers/{scheduler_id}/models/{model_id}": {
"patch": {
"description": "Update by json config",
},
"delete": {
"description": "Destroy by id",
"consumes": [
"application/json"
],
Expand All @@ -2340,7 +2343,7 @@ const docTemplate = `{
"tags": [
"Model"
],
"summary": "Update Model",
"summary": "Destroy Model Version",
"parameters": [
{
"type": "string",
Expand All @@ -2357,21 +2360,16 @@ const docTemplate = `{
"required": true
},
{
"description": "Model",
"name": "Model",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.UpdateModelRequest"
}
"type": "string",
"description": "version_id",
"name": "version_id",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.Model"
}
"description": "OK"
},
"400": {
"description": "Bad Request"
Expand All @@ -2383,9 +2381,7 @@ const docTemplate = `{
"description": "Internal Server Error"
}
}
}
},
"/schedulers/{scheduler_id}/models/{model_id}/versions/{version_id}": {
},
"patch": {
"description": "Update by json config",
"consumes": [
Expand Down Expand Up @@ -3888,6 +3884,13 @@ const docTemplate = `{
"schema": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.ResetPasswordRequest"
}
},
{
"type": "integer",
"description": "id",
"name": "id",
"in": "path",
"required": true
}
],
"responses": {
Expand Down

0 comments on commit 6479dd9

Please sign in to comment.