Fixing panic when d.deviceConfig is nil

hairyhenderson · hairyhenderson · commit 6d750d04f177 · 2015-05-04T22:13:50.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
@@ -301,7 +301,7 @@ func (d *Driver) GetIP() (string, error) {
 	if d.IPAddress != "" {
 		return d.IPAddress, nil
 	}
-	if d.deviceConfig.PrivateNet {
+	if d.deviceConfig != nil && d.deviceConfig.PrivateNet == true {
 		return d.getClient().VirtualGuest().GetPrivateIp(d.Id)
 	} else {
 		return d.getClient().VirtualGuest().GetPublicIp(d.Id)

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ func (d *Driver) GetIP() (string, error) {`
`301`	`301`	`if d.IPAddress != "" {`
`302`	`302`	`return d.IPAddress, nil`
`303`	`303`	`}`
`304`		`- if d.deviceConfig.PrivateNet {`
	`304`	`+ if d.deviceConfig != nil && d.deviceConfig.PrivateNet == true {`
`305`	`305`	`return d.getClient().VirtualGuest().GetPrivateIp(d.Id)`
`306`	`306`	`} else {`
`307`	`307`	`return d.getClient().VirtualGuest().GetPublicIp(d.Id)`