From 949e4ffe8f6eacca99ad1ea8ca21790d0e5c686c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.systems>
Date: Thu, 7 Feb 2019 16:54:34 +0100
Subject: [PATCH] development: Adapt docker-machine addon to new GO API
 structure and fix minor bugs (#2908)

---
 src/docker_machine/src/docker_machine/opennebula.go | 6 ++++--
 src/oca/go/src/goca/permissions.go                  | 2 +-
 src/oca/go/src/goca/virtualnetwork.go               | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/docker_machine/src/docker_machine/opennebula.go b/src/docker_machine/src/docker_machine/opennebula.go
index 1ccc88fe23..9de6b407e7 100644
--- a/src/docker_machine/src/docker_machine/opennebula.go
+++ b/src/docker_machine/src/docker_machine/opennebula.go
@@ -521,8 +521,10 @@ func (d *Driver) GetIP() (string, error) {
 		return "", err
 	}
 
-	if ip, ok := vm.XPath("/VM/TEMPLATE/NIC/IP"); ok {
-		d.IPAddress = ip
+	if len(vm.Template.NIC) > 0 {
+		if vm.Template.NIC[0].IP != "" {
+			d.IPAddress = vm.Template.NIC[0].IP
+		}
 	}
 
 	if d.IPAddress == "" {
diff --git a/src/oca/go/src/goca/permissions.go b/src/oca/go/src/goca/permissions.go
index 101a196192..8185339a5a 100644
--- a/src/oca/go/src/goca/permissions.go
+++ b/src/oca/go/src/goca/permissions.go
@@ -15,7 +15,7 @@ type Permissions struct {
 }
 
 func (p *Permissions) String() string {
-	permStr := [8]string{"uma", "um-", "u-a", "u--", "-ma", "-m-", "--a", "---"}
+	permStr := [8]string{"---", "--a", "-m-", "-ma", "u--", "u-a", "um-", "uma"}
 	owner := permStr[p.OwnerU<<2|p.OwnerM<<1|p.OwnerA]
 	group := permStr[p.GroupU<<2|p.GroupM<<1|p.GroupA]
 	other := permStr[p.OtherU<<2|p.OtherM<<1|p.OtherA]
diff --git a/src/oca/go/src/goca/virtualnetwork.go b/src/oca/go/src/goca/virtualnetwork.go
index 91593ae14c..db1016e7ee 100644
--- a/src/oca/go/src/goca/virtualnetwork.go
+++ b/src/oca/go/src/goca/virtualnetwork.go
@@ -85,13 +85,13 @@ type virtualNetworkAR struct {
 type lease struct {
 	IP        string `xml:"IP"`
 	IP6       string `xml:"IP6"`
-	IP6Global string `xml:"IP6Global"`
-	IP6Link   string `xml:"IP6Link"`
+	IP6Global string `xml:"IP6GLOBAL"`
+	IP6Link   string `xml:"IP6LINK"`
 	IP6ULA    string `xml:"IP6ULA"`
 	MAC       string `xml:"MAC"`
 	VM        int    `xml:"VM"`
-	VNet      int    `xml:"VNet"`
-	VRouter   int    `xml:"VRouter"`
+	VNet      int    `xml:"VNET"`
+	VRouter   int    `xml:"VROUTER"`
 }
 
 // NewVirtualNetworkPool returns a virtualnetwork pool. A connection to OpenNebula is