From 9e9383d059317ffc823c43ce26b8db7251366765 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 17:05:36 -0700 Subject: [PATCH] finally works with the new 'alpha' accounts Signed-off-by: Jeff Carr --- README.md | 2 +- VERSION | 2 +- gui-debug.go | 3 --- gui-vmPage.go | 8 +++++--- main.go | 2 ++ resources/cloud-control-panel.json | 22 ++++++++++++++++++++++ 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5d45a90..1b388b9 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,5 @@ This is a GPL 3.0 Project. # Credits * All the GO developers & Google -* The analabs people that made the golang cross platform UI +* The andlabs people that made the golang cross platform UI * All the kernel, KVM and QEMU developers diff --git a/VERSION b/VERSION index d2b13eb..ef5e445 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.4 +0.6.5 diff --git a/gui-debug.go b/gui-debug.go index 8842f7d..7d8ff54 100644 --- a/gui-debug.go +++ b/gui-debug.go @@ -12,9 +12,6 @@ import "git.wit.com/wit/gui" import "github.com/davecgh/go-spew/spew" -// import "github.com/andlabs/ui" -// import _ "github.com/andlabs/ui/winmanifest" - // import pb "git.wit.com/wit/witProtobuf" func debugClick(b *gui.GuiButton) { diff --git a/gui-vmPage.go b/gui-vmPage.go index 31af678..0432d7f 100644 --- a/gui-vmPage.go +++ b/gui-vmPage.go @@ -85,7 +85,8 @@ func createAddVmBox(b *gui.GuiButton) { txt := "ADD VM " + name gw = gui.InitGuiWindow(txt, gw) - box := gui.HardBox(gw, gui.Xaxis, txt) + box := gui.HardBox(gw, gui.Yaxis, txt) + box = gui.HardBox(gw, gui.Xaxis, txt) // box := gui.AddGenericBox(gw, name) // Add hostname entry box @@ -95,9 +96,10 @@ func createAddVmBox(b *gui.GuiButton) { log.Println("createAddVmBox() hostname, memory, disk =", hostname, memory, disk) - gui.HorizontalBreak(box) + // gui.HorizontalBreak(box) + box = gui.HardBox(gw, gui.Xaxis, txt) - makeButton(box, values.Account, nil, "Add Virtual Machine", "CREATE", nil) + makeButton(box, values.Account, nil, "Add Virtual Machine", "CREATE", createVmClick) makeButton(box, values.Account, nil, "Cancel", "CLOSE", nil) } diff --git a/main.go b/main.go index 1176350..5d1fdfd 100644 --- a/main.go +++ b/main.go @@ -106,6 +106,8 @@ func main() { initChannel() go processEvents() + v185AAAA := lookupAAAA("v000185.testing.com.customers.wprod.wit.com") + log.Println("v185AAA = ", v185AAAA) go gorillaDial("v000185.testing.com.customers.wprod.wit.com:9000") go gui.WatchGUI() diff --git a/resources/cloud-control-panel.json b/resources/cloud-control-panel.json index 5b085aa..00c3f11 100644 --- a/resources/cloud-control-panel.json +++ b/resources/cloud-control-panel.json @@ -4,6 +4,28 @@ "accounts": [ { "id": 42, + "nick": "Alpha jcarr", + "username": "jcarr@wit.com", + "email": "jcarr@wit.com", + "token": "alksjdf", + "hostname": "jcarr.customers.wprod.wit.com", + "password": "witbadpass", + "URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/", + "domain": "jcarr" + }, + { + "id": 44, + "nick": "Alpha alfonso", + "username": "alfonso@wit.com", + "email": "alfonso@wit.com", + "token": "aklsdjf", + "hostname": "alfonso.customers.wprod.wit.com", + "password": "witbadpass", + "URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/", + "domain": "alfonso" + }, + { + "id": 142, "nick": "USW3jcarr", "username": "jcarr@wit.com", "token": "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJ4IjozLCJyIjoiIiwiY3NyZiI6InRBY1p2eXVJbk1YdWUxV0RSbDFIeDI5YSIsImV4cCI6MTU1OTI3MDQwMCwiaXNzIjoid2l0Iiwic3ViIjoiamNhcnJAd2l0LmNvbSJ9.bqXX_6yrUHQGYh3SEmW8ydSa9Xfqx-HIKutTN_GirwhC_VrVX1xJBcgYfjdKGegvwY7Td1vO3rs40Iz7ifcptrtdzJnDX62d_1JJPKBHUQUfnTLr2qoTgaljElFM0Q_e",