Use go module as dependency tool instead of glide

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

diff --git a/lib/agent/apiv1-config.go b/lib/agent/apiv1-config.go
index 40f65df..543a5e1 100644 (file)
--- a/lib/agent/apiv1-config.go
+++ b/lib/agent/apiv1-config.go
@@ -1,13 +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 (
        "net/http"
        "sync"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
-       "github.com/iotbzh/xds-agent/lib/xaapiv1"
-       "github.com/iotbzh/xds-agent/lib/xdsconfig"
-       common "github.com/iotbzh/xds-common/golib"
 )
 
 var confMut sync.Mutex
@@ -49,8 +66,11 @@ func (s *APIService) setConfig(c *gin.Context) {
                }
        }
 
-       // Add new XDS Server
+       // Add new / unconnected XDS Server
        for _, svr := range cfgArg.Servers {
+               if svr.Connected && svr.ID != "" {
+                       continue
+               }
                cfg := xdsconfig.XDSServerConf{
                        ID:        svr.ID,
                        URL:       svr.URL,
@@ -62,6 +82,14 @@ func (s *APIService) setConfig(c *gin.Context) {
                }
        }
 
+       // Update XdsServer config
+       for _, svrCfg := range cfgArg.Servers {
+               if err := s.UpdateXdsServer(svrCfg); err != nil {
+                       // willingly ignore error
+                       // s.Log.Debugf("Error while updating XDS Server config: %v", err)
+               }
+       }
+
        c.JSON(http.StatusOK, s._getConfig())
 }