Use go module as dependency tool instead of glide

[src/xds/xds-agent.git] / lib / agent / apiv1.go

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 3ca84b9..4637bc4 100644 (file)
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -20,9 +20,10 @@ package agent
 import (
        "fmt"
        "strconv"
+       "strings"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
 )
@@ -66,6 +67,9 @@ func NewAPIV1(ctx *Context) *APIService {
        s.apiRouter.POST("/events/register", s.eventsRegister)
        s.apiRouter.POST("/events/unregister", s.eventsUnRegister)
 
+       s.apiRouter.GET("/supervisor/topo", s.getSupervisorTopo)
+       s.apiRouter.POST("/supervisor/trace/start", s.startSupervisor)
+       s.apiRouter.POST("/supervisor/trace/stop", s.stopSupervisor)
        return s
 }
 
@@ -99,12 +103,13 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
        } else {
 
                // Create a new server object
+               cfg.URLIndex = strconv.Itoa(s.serverIndex)
+               s.serverIndex = s.serverIndex + 1
                if cfg.APIBaseURL == "" {
                        cfg.APIBaseURL = apiBaseURL
                }
                if cfg.APIPartialURL == "" {
-                       cfg.APIPartialURL = "/servers/" + strconv.Itoa(s.serverIndex)
-                       s.serverIndex = s.serverIndex + 1
+                       cfg.APIPartialURL = "/servers/" + cfg.URLIndex
                }
 
                // Create a new XDS Server
@@ -112,11 +117,16 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 
                svr.SetLoggerOutput(s.Config.LogVerboseOut)
 
-               // Passthrough routes (handle by XDS Server)
+               // Define API group for this XDS Server
                grp := s.apiRouter.Group(svr.PartialURL)
                svr.SetAPIRouterGroup(grp)
 
-               // Declare passthrough routes
+               // Define servers API processed locally
+               s.apiRouter.GET("/servers", s.getServersList)       // API /servers
+               svr.apiRouter.GET("", s.getServer)                  // API /servers/:id
+               svr.apiRouter.POST("/reconnect", s.reconnectServer) // API /servers/:id/reconnect
+
+               // Declare passthrough API/routes
                s.sdksPassthroughInit(svr)
                s.targetsPassthroughInit(svr)
 
@@ -130,6 +140,12 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
                        if err := s.sdksEventsForwardInit(server); err != nil {
                                s.Log.Errorf("XDS Server %v - sdk events forwarding error: %v", server.ID, err)
                        }
+                       if err := s.targetsEventsForwardInit(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - target events forwarding error: %v", server.ID, err)
+                       }
+                       if err := s.terminalsEventsForwardInit(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - terminal events forwarding error: %v", server.ID, err)
+                       }
 
                        // Load projects
                        if err := s.projects.Init(server); err != nil {
@@ -179,3 +195,27 @@ func (s *APIService) UpdateXdsServer(cfg xaapiv1.ServerCfg) error {
 
        return nil
 }
+
+// GetXdsServerFromURLIndex Retrieve XdsServer from URLIndex value
+func (s *APIService) GetXdsServerFromURLIndex(urlIdx string) *XdsServer {
+       for _, svr := range s.xdsServers {
+               if svr.URLIndex == urlIdx {
+                       return svr
+               }
+       }
+       return nil
+}
+
+// ParamGetIndex Retrieve numerical parameter in request url
+func (s *APIService) ParamGetIndex(c *gin.Context) string {
+       uri := c.Request.RequestURI
+       for idx := strings.LastIndex(uri, "/"); idx > 0; {
+               id := uri[idx+1:]
+               if _, err := strconv.Atoi(id); err == nil {
+                       return id
+               }
+               uri = uri[:idx]
+               idx = strings.LastIndex(uri, "/")
+       }
+       return ""
+}