Fixed conflict name between exec package and local exec function.

[src/xds/xds-cli.git] / utils.go

diff --git a/utils.go b/utils.go
index 3d01346..afa0942 100644 (file)
--- a/utils.go
+++ b/utils.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,12 @@ package main
 import (
        "encoding/json"
        "fmt"
+       "sort"
        "strconv"
        "strings"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "github.com/franciscocpg/reflectme"
-       "github.com/iotbzh/xds-agent/lib/xaapiv1"
        "github.com/urfave/cli"
 )
 
@@ -90,6 +91,13 @@ func XdsServerComputeURL(endURL string) string {
        return "servers/" + strconv.Itoa(XdsServerIndexGet()) + endURL
 }
 
+// Sort projects by Label
+type _PrjByLabel []xaapiv1.ProjectConfig
+
+func (s _PrjByLabel) Len() int           { return len(s) }
+func (s _PrjByLabel) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s _PrjByLabel) Less(i, j int) bool { return s[i].Label < s[j].Label }
+
 // ProjectsListGet Get the list of existing projects
 func ProjectsListGet(prjs *[]xaapiv1.ProjectConfig) error {
        var data []byte
@@ -98,7 +106,13 @@ func ProjectsListGet(prjs *[]xaapiv1.ProjectConfig) error {
        }
        Log.Debugf("Result of /projects: %v", string(data[:]))
 
-       return json.Unmarshal(data, &prjs)
+       if err := json.Unmarshal(data, &prjs); err != nil {
+               return err
+       }
+
+       sort.Sort(_PrjByLabel(*prjs))
+
+       return nil
 }
 
 // LogPost Helper to log a POST request