X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fproject-pathmap.go;h=5d8b87bcfda88a8492d973bf347c97e8994199fc;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hp=aacbd1f0cbf2c4485459d3b848bd6967d617f485;hpb=2d90eac319979dba64371258b30e61e77a15db7d;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/project-pathmap.go b/lib/agent/project-pathmap.go
index aacbd1f..5d8b87b 100644
--- a/lib/agent/project-pathmap.go
+++ b/lib/agent/project-pathmap.go
@@ -1,3 +1,20 @@
+/*
+ * 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 (
@@ -6,7 +23,9 @@ import (
 	"os"
 	"strings"
 
-	common "github.com/iotbzh/xds-common/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 
 // IPROJECT interface implementation for native/path mapping projects
@@ -15,7 +34,7 @@ import (
 type PathMap struct {
 	*Context
 	server *XdsServer
-	folder *XdsFolderConfig
+	folder *xsapiv1.FolderConfig
 }
 
 // NewProjectPathMap Create a new instance of PathMap
@@ -23,13 +42,13 @@ func NewProjectPathMap(ctx *Context, svr *XdsServer) *PathMap {
 	p := PathMap{
 		Context: ctx,
 		server:  svr,
-		folder:  &XdsFolderConfig{},
+		folder:  &xsapiv1.FolderConfig{},
 	}
 	return &p
 }
 
 // Add a new project
-func (p *PathMap) Add(cfg ProjectConfig) (*ProjectConfig, error) {
+func (p *PathMap) Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
 	var err error
 	var file *os.File
 	errMsg := "ClientPath sanity check error (%d): %v"
@@ -68,7 +87,7 @@ func (p *PathMap) Add(cfg ProjectConfig) (*ProjectConfig, error) {
 	// Send request to create folder on XDS server side
 	err = p.server.FolderAdd(fld, p.folder)
 	if err != nil {
-		return nil, fmt.Errorf("Folders mapping verification failure.\n%v", err)
+		return nil, err
 	}
 
 	// 2nd part of sanity checker
@@ -91,22 +110,36 @@ func (p *PathMap) Delete() error {
 }
 
 // GetProject Get public part of project config
-func (p *PathMap) GetProject() *ProjectConfig {
+func (p *PathMap) GetProject() *xaapiv1.ProjectConfig {
 	prj := p.server.FolderToProject(*p.folder)
 	prj.ServerID = p.server.ID
 	return &prj
 }
 
-// UpdateProject Set project config
-func (p *PathMap) UpdateProject(prj ProjectConfig) (*ProjectConfig, error) {
+// Setup Setup local project config
+func (p *PathMap) Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
 	p.folder = p.server.ProjectToFolder(prj)
 	np := p.GetProject()
-	if err := p.events.Emit(EVTProjectChange, np); err != nil {
+	if err := p.events.Emit(xaapiv1.EVTProjectChange, np, ""); err != nil {
 		return np, err
 	}
 	return np, nil
 }
 
+// Update Update some field of a project
+func (p *PathMap) Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
+	if p.folder.ID != prj.ID {
+		return nil, fmt.Errorf("Invalid id")
+	}
+
+	err := p.server.FolderUpdate(p.server.ProjectToFolder(prj), p.folder)
+	if err != nil {
+		return nil, err
+	}
+
+	return p.GetProject(), nil
+}
+
 // GetServer Get the XdsServer that holds this project
 func (p *PathMap) GetServer() *XdsServer {
 	return p.server