X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fapiv1.go;h=3ca84b954c84ff35e553070a9497d46daee9a2ed;hb=befb10519daefcbee85950a4e574678fe4b7f402;hp=36e5a547c5efdd286c239e24a3dd2f1134d0c860;hpb=4d843d2bde236ec23810d0904dfb8aebbc53a37b;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 36e5a54..3ca84b9 100644
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -1,11 +1,30 @@
+/*
+ * 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/xaapiv1"
+	"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"
@@ -30,7 +49,7 @@ func NewAPIV1(ctx *Context) *APIService {
 	s.apiRouter.GET("/config", s.getConfig)
 	s.apiRouter.POST("/config", s.setConfig)
 
-	s.apiRouter.GET("/browse", s.browseFS)
+	// s.apiRouter.GET("/browse", s.browseFS)
 
 	s.apiRouter.GET("/projects", s.getProjects)
 	s.apiRouter.GET("/projects/:id", s.getProject)
@@ -84,7 +103,7 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 			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
 		}
 
@@ -99,6 +118,31 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 
 		// Declare passthrough routes
 		s.sdksPassthroughInit(svr)
+		s.targetsPassthroughInit(svr)
+
+		// Register callback on Connection
+		svr.ConnectOn(func(server *XdsServer) error {
+
+			// Add server to list
+			s.xdsServers[server.ID] = svr
+
+			// Register events forwarder
+			if err := s.sdksEventsForwardInit(server); err != nil {
+				s.Log.Errorf("XDS Server %v - sdk events 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
@@ -109,14 +153,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
 }
 
@@ -129,3 +165,17 @@ func (s *APIService) DelXdsServer(id string) error {
 	s.xdsServers[id].Close()
 	return nil
 }
+
+// UpdateXdsServer Update XDS Server configuration settings
+func (s *APIService) UpdateXdsServer(cfg xaapiv1.ServerCfg) error {
+	if _, exist := s.xdsServers[cfg.ID]; !exist {
+		return fmt.Errorf("Unknown Server ID %s", cfg.ID)
+	}
+
+	svr := s.xdsServers[cfg.ID]
+
+	// Update only some configurable fields
+	svr.ConnRetry = cfg.ConnRetry
+
+	return nil
+}