Migration to AGL gerrit (update go import)

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

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 3e742f5..c5f4d22 100644 (file)
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -1,14 +1,32 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
        "fmt"
        "strconv"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
-       "github.com/iotbzh/xds-agent/lib/xdsconfig"
 )
 
-const apiBaseUrl = "/api/v1"
+const apiBaseURL = "/api/v1"
 
 // APIService .
 type APIService struct {
@@ -21,7 +39,7 @@ type APIService struct {
 func NewAPIV1(ctx *Context) *APIService {
        s := &APIService{
                Context:     ctx,
-               apiRouter:   ctx.webServer.router.Group(apiBaseUrl),
+               apiRouter:   ctx.webServer.router.Group(apiBaseURL),
                serverIndex: 0,
        }
 
@@ -34,6 +52,7 @@ func NewAPIV1(ctx *Context) *APIService {
 
        s.apiRouter.GET("/projects", s.getProjects)
        s.apiRouter.GET("/projects/:id", s.getProject)
+       s.apiRouter.PUT("/projects/:id", s.updateProject)
        s.apiRouter.POST("/projects", s.addProject)
        s.apiRouter.POST("/projects/sync/:id", s.syncProject)
        s.apiRouter.DELETE("/projects/:id", s.delProject)
@@ -80,10 +99,10 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 
                // Create a new server object
                if cfg.APIBaseURL == "" {
-                       cfg.APIBaseURL = apiBaseUrl
+                       cfg.APIBaseURL = apiBaseURL
                }
                if cfg.APIPartialURL == "" {
-                       cfg.APIPartialURL = "/server/" + strconv.Itoa(s.serverIndex)
+                       cfg.APIPartialURL = "/servers/" + strconv.Itoa(s.serverIndex)
                        s.serverIndex = s.serverIndex + 1
                }
 
@@ -98,6 +117,30 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 
                // Declare passthrough routes
                s.sdksPassthroughInit(svr)
+
+               // Register callback on Connection
+               svr.ConnectOn(func(server *XdsServer) error {
+
+                       // Add server to list
+                       s.xdsServers[server.ID] = svr
+
+                       // Register event forwarder
+                       if err := s.sdksEventsForwardInit(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - sdk event forwarding error: %v", server.ID, err)
+                       }
+
+                       // Load projects
+                       if err := s.projects.Init(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - project init error: %v", server.ID, err)
+                       }
+
+                       // Registered to all events
+                       if err := server.EventRegister(xsapiv1.EVTAll, ""); err != nil {
+                               s.Log.Errorf("XDS Server %v - register all events error: %v", server.ID, err)
+                       }
+
+                       return nil
+               })
        }
 
        // Established connection
@@ -108,14 +151,6 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
                delete(s.xdsServers, cfg.ID)
        }
 
-       // Add to map
-       s.xdsServers[svr.ID] = svr
-
-       // Load projects
-       if err == nil && svr.Connected {
-               err = s.projects.Init(svr)
-       }
-
        return svr, err
 }