Allow set PVE API port

proxmox.go

@@ -40,12 +40,13 @@ type ProxmoxVE struct {
 }
 
 // GetProxmoxVEConnectionByValues is a wrapper for GetProxmoxVEConnection with strings as input
-func GetProxmoxVEConnectionByValues(username string, password string, realm string, hostname string) (*ProxmoxVE, error) {
+func GetProxmoxVEConnectionByValues(username string, password string, realm string, hostname string, port int) (*ProxmoxVE, error) {
 	return GetProxmoxVEConnection(&ProxmoxVE{
 		Username: username,
 		password: password,
 		Realm:    realm,
 		Host:     hostname,
+		Port:     port,
 	})
 }
 

proxmox_test.go

@@ -22,34 +22,34 @@ func TestSuccessfulConnection(t *testing.T) {
 	}
 }
 func TestWrongPass(t *testing.T) {
-	username, _, realm, host := GetProxmoxAccess()
-	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, "wrong_password", realm, host)
+	username, _, realm, host, port := GetProxmoxAccess()
+	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, "wrong_password", realm, host, port)
 	if err == nil {
 		t.Log(err)
 		t.Error()
 	}
 }
 func TestWrongUser(t *testing.T) {
-	_, password, realm, host := GetProxmoxAccess()
-	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues("root", password, realm, host)
+	_, password, realm, host, port:= GetProxmoxAccess()
+	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues("root", password, realm, host, port)
 	if err == nil {
 		t.Log(err)
 		t.Error()
 	}
 }
 
 func TestEmptyPass(t *testing.T) {
-	username, _, realm, host := GetProxmoxAccess()
-	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, "", realm, host)
+	username, _, realm, host, port := GetProxmoxAccess()
+	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, "", realm, host, port)
 	if err != nil && err.Error() != "You have to provide a password" {
 		t.Log(err)
 		t.Error()
 	}
 }
 
 func TestWrongHost(t *testing.T) {
-	username, password, realm, _ := GetProxmoxAccess()
-	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, password, realm, "127.0.0.1")
+	username, password, realm, _, port := GetProxmoxAccess()
+	_, err := dockermachinedriverproxmoxve.GetProxmoxVEConnectionByValues(username, password, realm, "127.0.0.1", port)
 	if err == nil {
 		t.Log(err)
 		t.Error()

proxmoxdriver.go

@@ -39,6 +39,7 @@ type Driver struct {
 
 	// Basic Authentication for Proxmox VE
 	Host     string // Host to connect to
+	Port     int // Host port to connect to
 	Node     string // optional, node to create VM on, host used if omitted but must match internal node name
 	User     string // username
 	Password string // password
@@ -100,11 +101,11 @@ func (d *Driver) connectAPI() error {
 	if d.driver == nil {
 		d.debugf("Create called")
 
-		d.debugf("Connecting to %s as %s@%s with password '%s'", d.Host, d.User, d.Realm, d.Password)
-		c, err := GetProxmoxVEConnectionByValues(d.User, d.Password, d.Realm, d.Host)
+		d.debugf("Connecting to %s:%d as %s@%s with password '%s'", d.Host, d.Port, d.User, d.Realm, d.Password)
+		c, err := GetProxmoxVEConnectionByValues(d.User, d.Password, d.Realm, d.Host, d.Port)
 		d.driver = c
 		if err != nil {
-			return fmt.Errorf("Could not connect to host '%s' with '%s@%s'", d.Host, d.User, d.Realm)
+			return fmt.Errorf("Could not connect to host '%s:%d' with '%s@%s'", d.Host, d.Port, d.User, d.Realm)
 		}
 		if d.restyDebug {
 			c.EnableDebugging()
@@ -123,6 +124,12 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Host to connect to",
 			Value:  "192.168.1.253",
 		},
+		mcnflag.IntFlag{
+			EnvVar: "PROXMOXVE_PROXMOX_PORT",
+			Name:   "proxmoxve-proxmox-port",
+			Usage:  "Host port to connect to",
+			Value:  8006,
+		},
 		mcnflag.StringFlag{
 			EnvVar: "PROXMOXVE_PROXMOX_NODE",
 			Name:   "proxmoxve-proxmox-node",
@@ -357,6 +364,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 
 	// PROXMOX API Connection settings
 	d.Host = flags.String("proxmoxve-proxmox-host")
+	d.Port = flags.Int("proxmoxve-proxmox-port")
 	d.Node = flags.String("proxmoxve-proxmox-node")
 	if len(d.Node) == 0 {
 		d.Node = d.Host

testconfig.json.example

@@ -1,5 +1,6 @@
 {
     "host":"10.255.0.5",
+    "port":"8006",
     "user":"root",
     "realm": "pam",
     "password":"P@ssw0rd",

testconfig_test.go

@@ -17,6 +17,7 @@ import (
 // ProxmoxConfig represents all needed login information
 type ProxmoxConfig struct {
 	Host     string `json:"host"`
+	Port     int    `json:"port"`
 	User     string `json:"user"`
 	Password string `json:"password"`
 	Realm    string `json:"realm"`
@@ -43,9 +44,9 @@ func GetProxmoxConfigInstance() *ProxmoxConfig {
 }
 
 // GetProxmoxAccess gets working proxmox ve access information
-func GetProxmoxAccess() (string, string, string, string) {
+func GetProxmoxAccess() (string, string, string, string, int) {
 	i := GetProxmoxConfigInstance()
-	return i.User, i.Password, i.Realm, i.Host
+	return i.User, i.Password, i.Realm, i.Host, i.Port
 }
 
 // GetProxmoxNode return the defined test node