Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add doc to create & start XDS AGL docker container.
[src/xds/xds-server.git]
/
lib
/
apiv1
/
apiv1.go
diff --git
a/lib/apiv1/apiv1.go
b/lib/apiv1/apiv1.go
index
56c7503
..
7fa69e9
100644
(file)
--- a/
lib/apiv1/apiv1.go
+++ b/
lib/apiv1/apiv1.go
@@
-4,6
+4,8
@@
import (
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
+ "github.com/iotbzh/xds-server/lib/crosssdk"
+ "github.com/iotbzh/xds-server/lib/model"
"github.com/iotbzh/xds-server/lib/session"
"github.com/iotbzh/xds-server/lib/xdsconfig"
)
"github.com/iotbzh/xds-server/lib/session"
"github.com/iotbzh/xds-server/lib/xdsconfig"
)
@@
-13,21
+15,26
@@
type APIService struct {
router *gin.Engine
apiRouter *gin.RouterGroup
sessions *session.Sessions
router *gin.Engine
apiRouter *gin.RouterGroup
sessions *session.Sessions
- cfg xdsconfig.Config
+ cfg *xdsconfig.Config
+ mfolder *model.Folder
+ sdks *crosssdk.SDKs
log *logrus.Logger
}
// New creates a new instance of API service
log *logrus.Logger
}
// New creates a new instance of API service
-func New(
sess *session.Sessions, cfg xdsconfig.Config, r *gin.Engine
) *APIService {
+func New(
r *gin.Engine, sess *session.Sessions, cfg *xdsconfig.Config, mfolder *model.Folder, sdks *crosssdk.SDKs
) *APIService {
s := &APIService{
router: r,
sessions: sess,
apiRouter: r.Group("/api/v1"),
cfg: cfg,
s := &APIService{
router: r,
sessions: sess,
apiRouter: r.Group("/api/v1"),
cfg: cfg,
+ mfolder: mfolder,
+ sdks: sdks,
log: cfg.Log,
}
s.apiRouter.GET("/version", s.getVersion)
log: cfg.Log,
}
s.apiRouter.GET("/version", s.getVersion)
+ s.apiRouter.GET("/xdsagent/info", s.getXdsAgentInfo)
s.apiRouter.GET("/config", s.getConfig)
s.apiRouter.POST("/config", s.setConfig)
s.apiRouter.GET("/config", s.getConfig)
s.apiRouter.POST("/config", s.setConfig)
@@
-37,13
+44,14
@@
func New(sess *session.Sessions, cfg xdsconfig.Config, r *gin.Engine) *APIServic
s.apiRouter.POST("/folder", s.addFolder)
s.apiRouter.DELETE("/folder/:id", s.delFolder)
s.apiRouter.POST("/folder", s.addFolder)
s.apiRouter.DELETE("/folder/:id", s.delFolder)
+ s.apiRouter.GET("/sdks", s.getSdks)
+ s.apiRouter.GET("/sdk/:id", s.getSdk)
+
s.apiRouter.POST("/make", s.buildMake)
s.apiRouter.POST("/make/:id", s.buildMake)
s.apiRouter.POST("/make", s.buildMake)
s.apiRouter.POST("/make/:id", s.buildMake)
- /* TODO: to be tested and then enabled
s.apiRouter.POST("/exec", s.execCmd)
s.apiRouter.POST("/exec/:id", s.execCmd)
s.apiRouter.POST("/exec", s.execCmd)
s.apiRouter.POST("/exec/:id", s.execCmd)
- */
return s
}
return s
}