Code Review
/
src
/
xds
/
xds-cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Used new agent lib name xaapiv1 and fix env setup.
[src/xds/xds-cli.git]
/
utils.go
diff --git
a/utils.go
b/utils.go
index
6a05ef3
..
b21fc19
100644
(file)
--- a/
utils.go
+++ b/
utils.go
@@
-3,21
+3,21
@@
package main
import (
"encoding/json"
import (
"encoding/json"
- "github.com/iotbzh/xds-agent/lib/apiv1"
+ "github.com/iotbzh/xds-agent/lib/
xa
apiv1"
"github.com/urfave/cli"
)
"github.com/urfave/cli"
)
-var cacheXdsVersion *apiv1.XDSVersion
+var cacheXdsVersion *
xa
apiv1.XDSVersion
// XdsVersionGet Get version of XDS agent & server
// XdsVersionGet Get version of XDS agent & server
-func XdsVersionGet(ver *apiv1.XDSVersion) error {
+func XdsVersionGet(ver *
xa
apiv1.XDSVersion) error {
// Use cached data
if cacheXdsVersion != nil {
ver = cacheXdsVersion
return nil
}
// Use cached data
if cacheXdsVersion != nil {
ver = cacheXdsVersion
return nil
}
- dataVer := apiv1.XDSVersion{}
+ dataVer :=
xa
apiv1.XDSVersion{}
if err := HTTPCli.Get("/version", &dataVer); err != nil {
return err
}
if err := HTTPCli.Get("/version", &dataVer); err != nil {
return err
}
@@
-29,7
+29,7
@@
func XdsVersionGet(ver *apiv1.XDSVersion) error {
// XdsServerIDGet returns the XDS Server ID
func XdsServerIDGet() string {
// XdsServerIDGet returns the XDS Server ID
func XdsServerIDGet() string {
- ver := apiv1.XDSVersion{}
+ ver :=
xa
apiv1.XDSVersion{}
if err := XdsVersionGet(&ver); err != nil {
return ""
}
if err := XdsVersionGet(&ver); err != nil {
return ""
}
@@
-46,7
+46,7
@@
func XdsServerIndexGet() int {
}
// ProjectsListGet Get the list of existing projects
}
// ProjectsListGet Get the list of existing projects
-func ProjectsListGet(prjs *[]apiv1.ProjectConfig) error {
+func ProjectsListGet(prjs *[]
xa
apiv1.ProjectConfig) error {
var data []byte
if err := HTTPCli.HTTPGet("/projects", &data); err != nil {
return err
var data []byte
if err := HTTPCli.HTTPGet("/projects", &data); err != nil {
return err