diff --git a/controllers/datacenter.go b/controllers/datacenter.go
index 5d9f9ea..dd9e5c1 100644
--- a/controllers/datacenter.go
+++ b/controllers/datacenter.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "encoding/json"
"fmt"
"net/http"
"oc-datacenter/infrastructure/monitor"
@@ -9,6 +10,7 @@ import (
oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/dbs"
+ "cloud.o-forge.io/core/oc-lib/models/live"
"cloud.o-forge.io/core/oc-lib/models/utils"
beego "github.com/beego/beego/v2/server/web"
"github.com/gorilla/websocket"
@@ -161,6 +163,51 @@ func (o *DatacenterController) Delete() {
o.ServeJSON()
}
+func GetResource(typ oclib.LibDataEnum) interface{} {
+ if typ == oclib.LibDataEnum(oclib.LIVE_DATACENTER) {
+ return &live.LiveDatacenter{}
+ }
+ if typ == oclib.LibDataEnum(oclib.LIVE_STORAGE) {
+ return &live.LiveStorage{}
+ }
+ return &live.AbstractLive{}
+}
+
+// @Title Search
+// @Description search workspace
+// @Param is_draft query string false
+// @Param offset query string false
+// @Param limit query string false
+// @Param data body json true "body for data content (Json format)"
+// @Success 200 {workspace} models.workspace
+// @router /:type/extended/search [post]
+func (o *DatacenterController) SearchExtended() {
+ user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+ // store and return Id or post with UUIDLibDataEnum
+ isDraft := o.Ctx.Input.Query("is_draft")
+ offset, _ := strconv.Atoi(o.Ctx.Input.Query("offset"))
+ limit, _ := strconv.Atoi(o.Ctx.Input.Query("limit"))
+ var res map[string]interface{}
+ json.Unmarshal(o.Ctx.Input.CopyBody(100000), &res)
+ m := map[string][]utils.ShallowDBObject{}
+ for _, col := range o.collection(false) {
+ if m[col.String()] == nil {
+ m[col.String()] = []utils.ShallowDBObject{}
+ }
+ fmt.Println(res, oclib.FiltersFromFlatMap(res, GetResource(col)))
+
+ s := oclib.NewRequest(col, user, peerID, groups, nil).Search(
+ oclib.FiltersFromFlatMap(res, GetResource(col)), "", isDraft == "true", int64(offset), int64(limit))
+ m[col.String()] = append(m[col.String()], s.Data...)
+ }
+ o.Data["json"] = map[string]interface{}{
+ "data": m,
+ "code": 200,
+ "err": nil,
+ }
+ o.ServeJSON()
+}
+
var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { return true }, // allow all origins
}
@@ -187,3 +234,25 @@ func (o *DatacenterController) Log() {
ctx := monitor.StreamRegistry.Register(id)
monitors.Stream(ctx, id, 1*time.Second, conn)
}
+
+// @Title Post
+// @Description search resources across all types
+// @Param type path string true "the type you want to get"
+// @Param data body json true "body for data content (Json format)"
+// @Success 200 {resource} models.resource
+// @router /:type [post]
+func (o *DatacenterController) Post() {
+ libs := o.collection(true)
+ if len(libs) == 0 {
+ o.Data["json"] = map[string]interface{}{
+ "data": nil,
+ "code": 500,
+ "err": "not a proper type",
+ }
+ }
+ user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+ var res map[string]interface{}
+ json.Unmarshal(o.Ctx.Input.CopyBody(100000), &res)
+ o.Data["json"] = oclib.NewRequest(libs[0], user, peerID, groups, nil).StoreOne(res)
+ o.ServeJSON()
+}
diff --git a/env.env b/env.env
index c0d18f1..d60dd97 100644
--- a/env.env
+++ b/env.env
@@ -1,4 +1,4 @@
-KUBERNETES_SERVICE_HOST=192.168.47.20
-KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
-KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
-KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
+KUBERNETES_SERVICE_HOST=192.168.1.169
+KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTnpReU56STVNVEF3SGhjTk1qWXdNekl6TVRNek5URXdXaGNOTXpZd016SXdNVE16TlRFdwpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTnpReU56STVNVEF3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSSGpYRDVpbnRIYWZWSk5VaDFlRnIxcXBKdFlkUmc5NStKVENEa0tadTIKYjUxRXlKaG1zanRIY3BDUndGL1VGMzlvdzY4TFBUcjBxaUorUHlhQTBLZUtvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTdWQkNzZVN3ajJ2cmczMFE5UG8vCnV6ZzAvMjR3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUlEOVY2aFlUSS83ZW1hRzU0dDdDWVU3TXFSdDdESUkKNlgvSUwrQ0RLbzlNQWlCdlFEMGJmT0tVWDc4UmRGdUplcEhEdWFUMUExaGkxcWdIUGduM1dZdDBxUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJUU5KbFNJQUJPMDR3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOemMwTWpjeU9URXdNQjRYRFRJMk1ETXlNekV6TXpVeE1Gb1hEVEkzTURNeQpNekV6TXpVeE1Gb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJMY3Uwb2pUbVg4RFhTQkYKSHZwZDZNVEoyTHdXc1lRTmdZVURXRDhTVERIUWlCczlMZ0x5ZTdOMEFvZk85RkNZVW1HamhiaVd3WFVHR3dGTgpUdlRMU2lXalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUlJhRW9wQzc5NGJyTHlnR0g5SVhvbDZTSmlFREFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQWhaRUlrSWV3Y1loL1NmTFVCVjE5MW1CYTNRK0J5S2J5eTVlQmpwL3kzeWtDSUIxWTJicTVOZTNLUUU4RAprNnNzeFJrbjJmN0VoWWVRQU1pUlJ2MjIweDNLCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTnpReU56STVNVEF3SGhjTk1qWXdNekl6TVRNek5URXdXaGNOTXpZd016SXdNVE16TlRFdwpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTnpReU56STVNVEF3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTcTdVTC85MEc1ZmVTaE95NjI3eGFZWlM5dHhFdWFoWFQ3Vk5wZkpQSnMKaEdXd2UxOXdtbXZzdlp6dlNPUWFRSzJaMmttN0hSb1IrNlA1YjIyamczbHVvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVVXaEtLUXUvZUc2eThvQmgvU0Y2Ckpla2lZaEF3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUk3cGxHczFtV20ySDErbjRobDBNTk13RmZzd0o5ZXIKTzRGVkM0QzhwRG44QWlCN3NZMVFwd2M5VkRUeGNZaGxuZzZNUzRXai85K0lHWjJxcy94UStrMjdTQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUROZDRnWXd6aVRhK1hwNnFtNVc3SHFzc1JJNkREaUJTbUV2ZHoxZzk3VGxvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFdHk3U2lOT1pmd05kSUVVZStsM294TW5ZdkJheGhBMkJoUU5ZUHhKTU1kQ0lHejB1QXZKNwpzM1FDaDg3MFVKaFNZYU9GdUpiQmRRWWJBVTFPOU10S0pRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
diff --git a/oc-datacenter b/oc-datacenter
new file mode 100755
index 0000000..c8910c9
Binary files /dev/null and b/oc-datacenter differ
diff --git a/routers/commentsRouter.go b/routers/commentsRouter.go
index da00c12..79b3251 100644
--- a/routers/commentsRouter.go
+++ b/routers/commentsRouter.go
@@ -52,6 +52,15 @@ func init() {
Filters: nil,
Params: nil})
+ beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"],
+ beego.ControllerComments{
+ Method: "Post",
+ Router: `/:type`,
+ AllowHTTPMethods: []string{"post"},
+ MethodParams: param.Make(),
+ Filters: nil,
+ Params: nil})
+
beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"],
beego.ControllerComments{
Method: "Get",
@@ -70,6 +79,15 @@ func init() {
Filters: nil,
Params: nil})
+ beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"],
+ beego.ControllerComments{
+ Method: "SearchExtended",
+ Router: `/:type/extended/search`,
+ AllowHTTPMethods: []string{"post"},
+ MethodParams: param.Make(),
+ Filters: nil,
+ Params: nil})
+
beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"] = append(beego.GlobalControllerRouter["oc-datacenter/controllers:DatacenterController"],
beego.ControllerComments{
Method: "Search",
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 41fee25..9d0c3f2 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -245,6 +245,81 @@
}
}
},
+ "/{type}": {
+ "post": {
+ "tags": [
+ "oc-datacenter/controllersDatacenterController"
+ ],
+ "description": "search resources across all types\n\u003cbr\u003e",
+ "operationId": "DatacenterController.Post",
+ "parameters": [
+ {
+ "in": "path",
+ "name": "type",
+ "description": "the type you want to get",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "in": "body",
+ "name": "data",
+ "description": "body for data content (Json format)",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/json"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{resource} models.resource"
+ }
+ }
+ }
+ },
+ "/{type}/extended/search": {
+ "post": {
+ "tags": [
+ "oc-datacenter/controllersDatacenterController"
+ ],
+ "description": "search workspace\n\u003cbr\u003e",
+ "operationId": "DatacenterController.Search",
+ "parameters": [
+ {
+ "in": "query",
+ "name": "is_draft",
+ "description": "false",
+ "type": "string"
+ },
+ {
+ "in": "query",
+ "name": "offset",
+ "description": "false",
+ "type": "string"
+ },
+ {
+ "in": "query",
+ "name": "limit",
+ "description": "false",
+ "type": "string"
+ },
+ {
+ "in": "body",
+ "name": "data",
+ "description": "body for data content (Json format)",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/json"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{workspace} models.workspace"
+ }
+ }
+ }
+ },
"/{type}/search/{search}": {
"get": {
"tags": [
@@ -368,6 +443,10 @@
"allowed_image.AllowedImage": {
"title": "AllowedImage",
"type": "object"
+ },
+ "json": {
+ "title": "json",
+ "type": "object"
}
},
"tags": [
diff --git a/swagger/swagger.yml b/swagger/swagger.yml
index edb5ead..db5592a 100644
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -41,6 +41,29 @@ paths:
responses:
"200":
description: '{booking} models.booking'
+ /{type}:
+ post:
+ tags:
+ - oc-datacenter/controllersDatacenterController
+ description: |-
+ search resources across all types
+
+ operationId: DatacenterController.Post
+ parameters:
+ - in: path
+ name: type
+ description: the type you want to get
+ required: true
+ type: string
+ - in: body
+ name: data
+ description: body for data content (Json format)
+ required: true
+ schema:
+ $ref: '#/definitions/json'
+ responses:
+ "200":
+ description: '{resource} models.resource'
/{type}/{id}:
get:
tags:
@@ -92,6 +115,36 @@ paths:
responses:
"200":
description: '{booking} models.booking'
+ /{type}/extended/search:
+ post:
+ tags:
+ - oc-datacenter/controllersDatacenterController
+ description: |-
+ search workspace
+
+ operationId: DatacenterController.Search
+ parameters:
+ - in: query
+ name: is_draft
+ description: "false"
+ type: string
+ - in: query
+ name: offset
+ description: "false"
+ type: string
+ - in: query
+ name: limit
+ description: "false"
+ type: string
+ - in: body
+ name: data
+ description: body for data content (Json format)
+ required: true
+ schema:
+ $ref: '#/definitions/json'
+ responses:
+ "200":
+ description: '{workspace} models.workspace'
/{type}/search/{search}:
get:
tags:
@@ -269,6 +322,9 @@ definitions:
allowed_image.AllowedImage:
title: AllowedImage
type: object
+ json:
+ title: json
+ type: object
tags:
- name: oc-datacenter/controllersDatacenterController
description: |