/*
- * 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");
"fmt"
"os"
"regexp"
+ "sort"
- "github.com/iotbzh/xds-agent/lib/xaapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
"github.com/urfave/cli"
)
Name: "file, f",
Usage: "use this file to install SDK",
},
+ cli.BoolFlag{
+ Name: "debug",
+ Usage: "enable debug mode (useful to investigate install issue)",
+ },
cli.BoolFlag{
Name: "force",
Usage: "force SDK installation when already installed",
},
+ cli.BoolFlag{
+ Name: "short, s",
+ Usage: "short output, only print create sdk id (useful from scripting)",
+ },
},
},
{
Usage: "sdk id to un-install",
EnvVar: "XDS_SDK_ID",
},
+ cli.BoolFlag{
+ Name: "force, f",
+ Usage: "remove confirmation prompt before removal",
+ },
},
},
{
}
func sdksGet(ctx *cli.Context) error {
- id := GetID(ctx)
+ id := GetID(ctx, "XDS_SDK_ID")
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
first := true
writer := NewTableWriter()
for _, s := range sdks {
- if s.Status != xaapiv1.SdkStatusInstalled && !all {
+ if s.Status != xaapiv1.SdkStatusInstalled &&
+ s.Status != xaapiv1.SdkStatusInstalling &&
+ !all {
continue
}
if filter != "" {
fmt.Fprintln(writer, "Version\t"+s.Version)
fmt.Fprintln(writer, "Status\t"+s.Status)
fmt.Fprintln(writer, "Path\t"+s.Path)
- fmt.Fprintln(writer, "Url\t"+s.URL)
+ fmt.Fprintln(writer, "Url\t"+formatURL(s.URL))
+ fmt.Fprintln(writer, "Image Url\t"+formatURL(s.ImageURL))
} else {
if first {
if all {
fmt.Fprintf(writer, "List of available SDKs: \n")
} else {
- fmt.Fprintf(writer, "List of installed SDKs: \n")
+ fmt.Fprintf(writer, "List of installed SDKs: \n")
}
- fmt.Fprintf(writer, " ID\tNAME\tSTATUS\tVERSION\tARCH\n")
+ fmt.Fprintf(writer, "ID\t NAME\t STATUS\t VERSION\t ARCH\n")
}
- fmt.Fprintf(writer, " %s\t%s\t%s\t%s\t%s\n", s.ID[:8], s.Name, s.Status, s.Version, s.Arch)
+ fmt.Fprintf(writer, "%s\t %s\t %s\t %s\t %s\n", s.ID[:8], s.Name, s.Status, s.Version, s.Arch)
}
first = false
}
writer.Flush()
}
+// Sort SDKs by ID
+type _SdkByID []xaapiv1.SDK
+
+func (s _SdkByID) Len() int { return len(s) }
+func (s _SdkByID) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s _SdkByID) Less(i, j int) bool { return s[i].ID < s[j].ID }
+
+// _sdksListGet Get the list of existing sdks
func _sdksListGet(sdks *[]xaapiv1.SDK) error {
url := XdsServerComputeURL("/sdks")
if err := HTTPCli.Get(url, &sdks); err != nil {
}
Log.Debugf("Result of %s: %v", url, sdks)
+ sort.Sort(_SdkByID(*sdks))
+
return nil
}
func sdksInstall(ctx *cli.Context) error {
- id := GetID(ctx)
- if id == "" {
- return cli.NewExitError("id parameter or option must be set", 1)
+ id := GetID(ctx, "XDS_SDK_ID")
+ file := ctx.String("file")
+ force := ctx.Bool("force")
+ shortOut := ctx.Bool("short")
+
+ if id == "" && file == "" {
+ return cli.NewExitError("id or file parameter or option must be set", 1)
}
// Process Socket IO events
}
exitChan := make(chan exitResult, 1)
- IOsk.On("disconnection", func(err error) {
+ IOSkClient.On("disconnection", func(err error) {
Log.Debugf("WS disconnection event with err: %v\n", err)
errMsg := ""
if err != nil {
exitChan <- exitResult{errMsg, 2}
})
- IOsk.On(xaapiv1.EVTSDKInstall, func(ev xaapiv1.EventMsg) {
- sdkEvt, _ := ev.DecodeSDKMsg()
+ IOSkClient.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
+ sdkEvt, _ := ev.DecodeSDKMgtMsg()
+
+ if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
+ Log.Debugf("EVTSDKManagement (action %s) IGNORED", sdkEvt.Action)
+ return
+ }
- if sdkEvt.Stdout != "" {
- fmt.Printf("%s", sdkEvt.Stdout)
+ if !shortOut && len(sdkEvt.Stdout) > 0 {
+ os.Stdout.Write([]byte(sdkEvt.Stdout))
}
- if sdkEvt.Stderr != "" {
- fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
+ if !shortOut && len(sdkEvt.Stderr) > 0 {
+ os.Stderr.Write([]byte(sdkEvt.Stderr))
}
if sdkEvt.Exited {
}
})
- evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTSDKInstall}
+ IOSkClient.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+ sdk, _ := ev.DecodeSDKEvent()
+ Log.Debugf("EVTSDKStateChange: %v", sdk)
+ })
+
+ evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTAll}
if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil {
return cli.NewExitError(err, 1)
}
- file := ctx.String("file")
- force := ctx.Bool("force")
url := XdsServerComputeURL("/sdks")
- sdks := xaapiv1.SDKInstallArgs{ID: id, Filename: file, Force: force}
+ sdks := xaapiv1.SDKInstallArgs{
+ ID: id,
+ Filename: file,
+ Force: force,
+ }
+
+ if ctx.Bool("debug") {
+ sdks.InstallArgs = []string{"--debug"}
+ }
+
newSdk := xaapiv1.SDK{}
if err := HTTPCli.Post(url, &sdks, &newSdk); err != nil {
return cli.NewExitError(err, 1)
}
Log.Debugf("Result of %s: %v", url, newSdk)
- fmt.Printf("Installation of '%s' SDK (id %v) successfully started.\n", newSdk.Name, newSdk.ID)
+ if !shortOut {
+ fmt.Printf("Installation of '%s' SDK successfully started.\n", newSdk.Name)
+ }
+ // TODO: trap CTRL+C and print question: "Installation of xxx is in progress, press 'a' to abort, 'b' to continue in background or 'c' to continue installation"
// Wait exit
select {
+ case res := <-IOSkClient.ServerDiscoChan:
+ Log.Debugf("XDS Server disconnected %v", res)
+ return cli.NewExitError(res.error, res.code)
+
case res := <-exitChan:
if res.code == 0 {
Log.Debugln("Exit successfully")
+ if shortOut {
+ fmt.Println(newSdk.ID)
+ } else {
+ fmt.Println("SDK ID " + newSdk.ID + " successfully installed.")
+ }
}
if res.error != "" {
Log.Debugln("Exit with ERROR: ", res.error)
}
func sdksUnInstall(ctx *cli.Context) error {
- id := GetID(ctx)
+ id := GetID(ctx, "XDS_SDK_ID")
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
- return fmt.Errorf("not supported yet")
+ if !ctx.Bool("force") {
+ if !Confirm("Do you permanently remove SDK id '" + id + "' [yes/No] ? ") {
+ return nil
+ }
+ }
+
+ delSdk := xaapiv1.SDK{}
+ url := XdsServerComputeURL("/sdks/" + id)
+ if err := HTTPCli.Delete(url, &delSdk); err != nil {
+ return cli.NewExitError(err, 1)
+ }
+
+ Log.Debugf("Result of %s: %v", url, delSdk)
+
+ fmt.Println("SDK ID " + delSdk.ID + " successfully deleted.")
+ return nil
}
func sdksAbort(ctx *cli.Context) error {
- id := GetID(ctx)
+ id := GetID(ctx, "XDS_SDK_ID")
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
Log.Debugf("Result of %s: %v", url, newSdk)
return nil
}
+
+func formatURL(u string) string {
+ if u == "" {
+ return "-"
+ }
+ return u
+}
Code Review / src / xds / xds-cli.git / blobdiff