Fix lint.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ff98fe3c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ff98fe3c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ff98fe3c Branch: refs/heads/trunk Commit: ff98fe3cf7d68207f620f6abed0a9af067d03567 Parents: da011b0 Author: Tomaz Muraus <[email protected]> Authored: Tue Nov 12 21:29:54 2013 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Tue Nov 12 21:40:37 2013 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/softlayer.py | 22 ++++++++++++++-------- libcloud/test/compute/test_softlayer.py | 6 +++--- 2 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ff98fe3c/libcloud/compute/drivers/softlayer.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/softlayer.py b/libcloud/compute/drivers/softlayer.py index 7c87a5f..3f89938 100644 --- a/libcloud/compute/drivers/softlayer.py +++ b/libcloud/compute/drivers/softlayer.py @@ -218,20 +218,28 @@ class SoftLayerNodeDriver(NodeDriver): recurringFee = host.get('billingItem', {}).get('recurringFee', 0) recurringMonths = host.get('billingItem', {}).get('recurringMonths', 0) createDate = host.get('createDate', None) - #When machine is launching it gets state halted - #we change this to pending - state = NODE_STATE_MAP.get( - host['powerState']['keyName'], NodeState.UNKNOWN) + + # When machine is launching it gets state halted + # we change this to pending + state = NODE_STATE_MAP.get(host['powerState']['keyName'], + NodeState.UNKNOWN) + if not password and state == NodeState.UNKNOWN: state = NODE_STATE_MAP['INITIATING'] public_ips = [] + private_ips = [] + if 'primaryIpAddress' in host: public_ips.append(host['primaryIpAddress']) - private_ips = [] + if 'primaryBackendIpAddress' in host: private_ips.append(host['primaryBackendIpAddress']) + image = host.get('operatingSystem', {}).get('softwareLicense', {}) \ + .get('softwareDescription', {}) \ + .get('longDescription', None) + return Node( id=host['id'], name=host['hostname'], @@ -244,9 +252,7 @@ class SoftLayerNodeDriver(NodeDriver): 'maxCpu': host.get('maxCpu', None), 'datacenter': host.get('datacenter', {}).get('longName', None), 'maxMemory': host.get('maxMemory', None), - 'image': host.get('operatingSystem', {}).get('softwareLicense', - {}).get('softwareDescription', - {}).get('longDescription', None), + 'image': image, 'hourlyRecurringFee': hourlyRecurringFee, 'recurringFee': recurringFee, 'recurringMonths': recurringMonths, http://git-wip-us.apache.org/repos/asf/libcloud/blob/ff98fe3c/libcloud/test/compute/test_softlayer.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_softlayer.py b/libcloud/test/compute/test_softlayer.py index 92a614d..4d1d9f8 100644 --- a/libcloud/test/compute/test_softlayer.py +++ b/libcloud/test/compute/test_softlayer.py @@ -70,9 +70,9 @@ class SoftLayerTests(unittest.TestCase): def test_create_node(self): node = self.driver.create_node(name="libcloud-testing", - location=self.driver.list_locations()[0], - size=self.driver.list_sizes()[0], - image=self.driver.list_images()[0]) + location=self.driver.list_locations()[0], + size=self.driver.list_sizes()[0], + image=self.driver.list_images()[0]) self.assertEqual(node.name, 'libcloud-testing') self.assertEqual(node.state, NODE_STATE_MAP['RUNNING'])
