X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fapiv1.go;h=d0e5a1cf84a78750cee4f41d72b60edcd42fd61b;hb=45f6472d1e8ecad428da314a6d762143f033865d;hp=3fd999059c3f665631df89fb224eb91aff1976af;hpb=be13167b869161b6e19dc3e94835245cdc7911e5;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 3fd9990..d0e5a1c 100644
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "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 (
@@ -6,9 +23,10 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/iotbzh/xds-agent/lib/xdsconfig"
+	"github.com/iotbzh/xds-server/lib/xsapiv1"
 )
 
-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,
 	}
 
@@ -33,10 +51,11 @@ func NewAPIV1(ctx *Context) *APIService {
 	s.apiRouter.GET("/browse", s.browseFS)
 
 	s.apiRouter.GET("/projects", s.getProjects)
-	s.apiRouter.GET("/project/:id", s.getProject)
-	s.apiRouter.POST("/project", s.addProject)
-	s.apiRouter.POST("/project/sync/:id", s.syncProject)
-	s.apiRouter.DELETE("/project/:id", s.delProject)
+	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)
 
 	s.apiRouter.POST("/exec", s.execCmd)
 	s.apiRouter.POST("/exec/:id", s.execCmd)
@@ -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
 		}
 
@@ -111,11 +130,21 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 	// Add to map
 	s.xdsServers[svr.ID] = svr
 
+	// Register event forwarder
+	s.sdksEventsForwardInit(svr)
+
 	// Load projects
 	if err == nil && svr.Connected {
 		err = s.projects.Init(svr)
 	}
 
+	// Registered to all events
+	if err == nil && svr.Connected {
+		if err = svr.EventRegister(xsapiv1.EVTAll, ""); err != nil {
+			s.Log.Errorf("XDS Server %v - register all events error: %v", svr.ID, err)
+		}
+	}
+
 	return svr, err
 }