diff --git a/Dockerfile b/Dockerfile
index 8bf0414..001c025 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /app
COPY --from=builder /app/setup /usr/bin/
COPY --from=builder /app/swagger /app/swagger
-COPY docker_conf.json /etc/oc/conf.json
+COPY docker_conf.json /etc/oc/peer.json
EXPOSE $PORT
diff --git a/README.md b/README.md
index 81311eb..5115882 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# oc-peers OpenCloud scheduler service.
+# oc-peer OpenCloud scheduler service.
Manages user schedulers
diff --git a/conf/app.conf b/conf/app.conf
index da5091b..d595eb9 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -1,4 +1,4 @@
-appname = oc-peers
+appname = oc-peer
httpport = 8080
runmode = dev
autorender = false
diff --git a/controllers/status.go b/controllers/status.go
index dcbabb1..f2a8f08 100644
--- a/controllers/status.go
+++ b/controllers/status.go
@@ -33,14 +33,9 @@ type StatusController struct {
func (o *StatusController) Status() {
var address map[string]string
json.Unmarshal(o.Ctx.Input.CopyBody(10000), &address)
- if len(address) == 0 { // default if nothing is send in body
- for _, host := range []string{tools.DATACENTERAPI, tools.WORKFLOWAPI, tools.WORKSPACEAPI,
- tools.SHAREDAPI, tools.CATALOGAPI, tools.PEERSAPI} {
- address[host] = "http://" + host + ":8080/oc"
- }
- }
api := tools.API{}
- state, services, err := api.CheckRemoteAPIs(address) // check if the services are alive
+ state, services, err := api.CheckRemoteAPIs([]tools.DataType{tools.BOOKING, tools.WORKFLOW, tools.WORKSPACE,
+ tools.COLLABORATIVE_AREA, tools.DATA_RESOURCE}) // check if the services are alive
errSTR := ""
if err != nil {
errSTR = err.Error()
diff --git a/docker-compose.yml b/docker-compose.yml
index fe15f53..ddb15b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
version: '3.4'
services:
- oc-peers:
+ oc-peer:
environment:
- MONGO_DATABASE=DC_myDC
- image: 'oc-peers:latest'
+ image: 'oc-peer:latest'
ports:
- 8093:8080
- container_name: oc-peers
+ container_name: oc-peer
networks:
- catalog
diff --git a/docker_conf.json b/docker_conf.json
index 1f0b88e..7302310 100644
--- a/docker_conf.json
+++ b/docker_conf.json
@@ -2,6 +2,5 @@
"MONGO_URL":"mongodb://mongo:27017/",
"MONGO_DATABASE":"DC_myDC",
"NATS_URL": "nats://nats:4222",
- "HOSTNAME": "oc-peers",
"PORT" : 8080
}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 727df96..ed75198 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
-module oc-peers
+module oc-peer
go 1.22.0
toolchain go1.22.4
require (
- cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e
+ cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a
github.com/beego/beego/v2 v2.3.1
github.com/smartystreets/goconvey v1.7.2
)
@@ -14,7 +14,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
- github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.1 // indirect
@@ -24,7 +24,7 @@ require (
github.com/goraz/onion v0.1.3 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
- github.com/klauspost/compress v1.17.10 // indirect
+ github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -50,11 +50,11 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
- golang.org/x/crypto v0.27.0 // indirect
- golang.org/x/net v0.29.0 // indirect
+ golang.org/x/crypto v0.28.0 // indirect
+ golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
- golang.org/x/sys v0.25.0 // indirect
- golang.org/x/text v0.18.0 // indirect
- google.golang.org/protobuf v1.34.2 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+ golang.org/x/text v0.19.0 // indirect
+ google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 1810f83..1040492 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,10 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJsw
cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015082307-62705cc9b93e h1:auncAXo/J15Dc5NVeyZRtyt6OJ602GNO+UhaBDeCAYc=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015082307-62705cc9b93e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a h1:2mBMc36WKh1/Dpomktx9dVXGxK0agFr7RdgvHTtyn2w=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/beego/beego/v2 v2.3.0 h1:iECVwzm6egw6iw6tkWrEDqXG4NQtKLQ6QBSYqlM6T/I=
github.com/beego/beego/v2 v2.3.0/go.mod h1:Ob/5BJ9fIKZLd4s9ZV3o9J6odkkIyL83et+p98gyYXo=
@@ -25,6 +29,8 @@ github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwc
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -57,6 +63,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -143,6 +151,8 @@ golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -153,6 +163,8 @@ golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -169,6 +181,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -177,6 +191,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -184,6 +200,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/main.go b/main.go
index 82fa311..dbe32ce 100644
--- a/main.go
+++ b/main.go
@@ -1,13 +1,13 @@
package main
import (
- _ "oc-peers/routers"
+ _ "oc-peer/routers"
oclib "cloud.o-forge.io/core/oc-lib"
beego "github.com/beego/beego/v2/server/web"
)
-const appname = "oc-peers"
+const appname = "oc-peer"
func main() {
// Init the oc-lib
diff --git a/oc-peers b/oc-peer
similarity index 75%
rename from oc-peers
rename to oc-peer
index d80bb27..6c0c941 100755
Binary files a/oc-peers and b/oc-peer differ
diff --git a/peers.json b/peer.json
similarity index 100%
rename from peers.json
rename to peer.json
diff --git a/routers/commentsRouter.go b/routers/commentsRouter.go
index a332862..265f8d5 100644
--- a/routers/commentsRouter.go
+++ b/routers/commentsRouter.go
@@ -7,7 +7,7 @@ import (
func init() {
- beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
beego.ControllerComments{
Method: "GetAll",
Router: `/`,
@@ -16,7 +16,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
beego.ControllerComments{
Method: "Put",
Router: `/:id`,
@@ -25,7 +25,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
beego.ControllerComments{
Method: "Get",
Router: `/:id`,
@@ -34,7 +34,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
beego.ControllerComments{
Method: "Search",
Router: `/search/:search`,
@@ -43,7 +43,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["oc-peers/controllers:StatusController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:StatusController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:StatusController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:StatusController"],
beego.ControllerComments{
Method: "Status",
Router: `/`,
@@ -52,7 +52,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["oc-peers/controllers:VersionController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:VersionController"],
+ beego.GlobalControllerRouter["oc-peer/controllers:VersionController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:VersionController"],
beego.ControllerComments{
Method: "GetAll",
Router: `/`,
diff --git a/routers/router.go b/routers/router.go
index f1e60ec..23a78ac 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -1,5 +1,5 @@
// @APIVersion 1.0.0
-// @Title oc-peers
+// @Title oc-peer
// @Description Manage OpenCloud peers
// @Contact admin@o-cloud.io
// @TermsOfServiceUrl http://cloud.o-forge.io/
@@ -8,7 +8,7 @@
package routers
import (
- "oc-peers/controllers"
+ "oc-peer/controllers"
beego "github.com/beego/beego/v2/server/web"
)
@@ -20,10 +20,8 @@ func init() {
&controllers.StatusController{},
),
),
- beego.NSNamespace("/peer",
- beego.NSInclude(
- &controllers.PeerController{},
- ),
+ beego.NSInclude(
+ &controllers.PeerController{},
),
beego.NSNamespace("/version",
beego.NSInclude(
diff --git a/swagger/swagger.json b/swagger/swagger.json
index d2935bc..1075b14 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
- "title": "oc-peers",
+ "title": "oc-peer",
"description": "Manage OpenCloud peers\n",
"version": "1.0.0",
"termsOfService": "http://cloud.o-forge.io/",
@@ -9,16 +9,16 @@
"email": "admin@o-cloud.io"
},
"license": {
- "name": "MIT",
- "url": "https://opensource.org/license/mit"
+ "name": "AGPL",
+ "url": "https://www.gnu.org/licenses/agpl-3.0.html"
}
},
"basePath": "/oc/",
"paths": {
- "/peer/": {
+ "/": {
"get": {
"tags": [
- "peer"
+ "oc-peer/controllersPeerController"
],
"description": "find all peer\n\u003cbr\u003e",
"operationId": "PeerController.GetAll",
@@ -29,10 +29,10 @@
}
}
},
- "/peer/search/{search}": {
+ "/search/{search}": {
"get": {
"tags": [
- "peer"
+ "oc-peer/controllersPeerController"
],
"description": "search workspace\n\u003cbr\u003e",
"operationId": "PeerController.Search",
@@ -52,62 +52,6 @@
}
}
},
- "/peer/{id}": {
- "get": {
- "tags": [
- "peer"
- ],
- "description": "find peer by peerid\n\u003cbr\u003e",
- "operationId": "PeerController.Get",
- "parameters": [
- {
- "in": "path",
- "name": "id",
- "description": "the peer id you want to get",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "200": {
- "description": "{peer} models.peer"
- }
- }
- },
- "put": {
- "tags": [
- "peer"
- ],
- "description": "create peers\n\u003cbr\u003e",
- "operationId": "PeerController.Update",
- "parameters": [
- {
- "in": "path",
- "name": "id",
- "description": "the peer id you want to get",
- "required": true,
- "type": "string"
- },
- {
- "in": "body",
- "name": "body",
- "description": "The peer content",
- "required": true,
- "schema": {
- "$ref": "#/definitions/models.peer"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "",
- "schema": {
- "$ref": "#/definitions/models.peer"
- }
- }
- }
- }
- },
"/status/": {
"post": {
"tags": [
@@ -145,6 +89,62 @@
}
}
}
+ },
+ "/{id}": {
+ "get": {
+ "tags": [
+ "oc-peer/controllersPeerController"
+ ],
+ "description": "find peer by peerid\n\u003cbr\u003e",
+ "operationId": "PeerController.Get",
+ "parameters": [
+ {
+ "in": "path",
+ "name": "id",
+ "description": "the peer id you want to get",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{peer} models.peer"
+ }
+ }
+ },
+ "put": {
+ "tags": [
+ "oc-peer/controllersPeerController"
+ ],
+ "description": "create peers\n\u003cbr\u003e",
+ "operationId": "PeerController.Update",
+ "parameters": [
+ {
+ "in": "path",
+ "name": "id",
+ "description": "the peer id you want to get",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "in": "body",
+ "name": "body",
+ "description": "The peer content",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.peer"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "",
+ "schema": {
+ "$ref": "#/definitions/models.peer"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -163,7 +163,7 @@
"description": "Operations about workflow\n"
},
{
- "name": "peer",
+ "name": "oc-peer/controllersPeerController",
"description": "Operations about workflow\n"
},
{
diff --git a/swagger/swagger.yml b/swagger/swagger.yml
index 3817774..58422af 100644
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -1,6 +1,6 @@
swagger: "2.0"
info:
- title: oc-peers
+ title: oc-peer
description: |
Manage OpenCloud peers
version: 1.0.0
@@ -8,14 +8,14 @@ info:
contact:
email: admin@o-cloud.io
license:
- name: MIT
- url: https://opensource.org/license/mit
+ name: AGPL
+ url: https://www.gnu.org/licenses/agpl-3.0.html
basePath: /oc/
paths:
- /peer/:
+ /:
get:
tags:
- - peer
+ - oc-peer/controllersPeerController
description: |-
find all peer
@@ -23,10 +23,10 @@ paths:
responses:
"200":
description: '{peer} models.peer'
- /peer/{id}:
+ /{id}:
get:
tags:
- - peer
+ - oc-peer/controllersPeerController
description: |-
find peer by peerid
@@ -42,7 +42,7 @@ paths:
description: '{peer} models.peer'
put:
tags:
- - peer
+ - oc-peer/controllersPeerController
description: |-
create peers
@@ -64,10 +64,10 @@ paths:
description: ""
schema:
$ref: '#/definitions/models.peer'
- /peer/search/{search}:
+ /search/{search}:
get:
tags:
- - peer
+ - oc-peer/controllersPeerController
description: |-
search workspace
@@ -120,7 +120,7 @@ tags:
- name: status
description: |
Operations about workflow
-- name: peer
+- name: oc-peer/controllersPeerController
description: |
Operations about workflow
- name: version
diff --git a/tests/default_test.go b/tests/default_test.go
index 0ea9568..5c12545 100644
--- a/tests/default_test.go
+++ b/tests/default_test.go
@@ -3,7 +3,7 @@ package test
import (
"net/http"
"net/http/httptest"
- _ "oc-peers/routers"
+ _ "oc-peer/routers"
"path/filepath"
"runtime"
"testing"