shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

M #-: Docker Machine getIP return EXTERNAL_IP if exists (#1052)

Browse Source
This commit is contained in:
Marco Mancini 2021-03-31 22:25:36 +02:00 committed by GitHub
parent 3d83d580f4
commit 69321f4905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/docker_machine/src/docker_machine/opennebula.go
View File

@ -9,9 +9,9 @@ import (
"github.com/OpenNebula/one/src/oca/go/src/goca"
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/shared"
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm/keys"
vm_schemas "github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm"
shared_schemas "github.com/OpenNebula/one/src/oca/go/src/goca/schemas/shared"
vm_schemas "github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm"
"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm/keys"
"github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/log"
@ -536,10 +536,17 @@ func (d *Driver) GetIP() (string, error) {
}
if len(vm.Template.GetNICs()) > 0 {
ip, err := vm.Template.GetNICs()[0].Get(shared_schemas.IP)
// check first for External IP
ip, err := vm.Template.GetNICs()[0].Get(shared_schemas.ExternalIP)
if err == nil && ip != "" {
d.IPAddress = ip
} else {
// check for IP (if External IP is not defined)
ip, err = vm.Template.GetNICs()[0].Get(shared_schemas.IP)
if err == nil && ip != "" {
d.IPAddress = ip
}
}
}

1
src/oca/go/src/goca/schemas/shared/nic.go
View File

@ -62,6 +62,7 @@ const (
Name NICKeys = "NAME"
Parent NICKeys = "PARENT"
External NICKeys = "EXTERNAL"
ExternalIP NICKeys = "EXTERNAL_IP"
)
// NewNIC returns a structure disk entity to build