Fixing bug in GetIP where Public IP would always be returned despite use of --softlayer-private-net-only

hairyhenderson · hairyhenderson · commit bd35fb31014b · 2015-05-03T22:14:11.000-04:00
Signed-off-by: Dave Henderson &lt;Dave.Henderson@ca.ibm.com&gt;
diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go
@@ -275,7 +275,11 @@ func (d *Driver) GetIP() (string, error) {
 	if d.IPAddress != "" {
 		return d.IPAddress, nil
 	}
-	return d.getClient().VirtualGuest().GetPublicIp(d.Id)
+	if d.deviceConfig.PrivateNet {
+		return d.getClient().VirtualGuest().GetPrivateIp(d.Id)
+	} else {
+		return d.getClient().VirtualGuest().GetPublicIp(d.Id)
+	}
 }
 
 func (d *Driver) GetState() (state.State, error) {

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,11 @@ func (d *Driver) GetIP() (string, error) {`
`275`	`275`	`if d.IPAddress != "" {`
`276`	`276`	`return d.IPAddress, nil`
`277`	`277`	`}`
`278`		`- return d.getClient().VirtualGuest().GetPublicIp(d.Id)`
	`278`	`+ if d.deviceConfig.PrivateNet {`
	`279`	`+ return d.getClient().VirtualGuest().GetPrivateIp(d.Id)`
	`280`	`+ } else {`
	`281`	`+ return d.getClient().VirtualGuest().GetPublicIp(d.Id)`
	`282`	`+ }`
`279`	`283`	`}`
`280`	`284`
`281`	`285`	`func (d *Driver) GetState() (state.State, error) {`