From a18eb67e4b57a6af4e6c3aebbf2e64d64388d172 Mon Sep 17 00:00:00 2001 From: Roel Van Nyen Date: Tue, 22 Apr 2014 18:16:50 +0200 Subject: [PATCH 1/2] the hostname should be fullyQualifiedDomainName instead of hostname, otherwise you dont know the full name. --- libcloud/compute/drivers/softlayer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcloud/compute/drivers/softlayer.py b/libcloud/compute/drivers/softlayer.py index ced4a34b81..10f30d438b 100644 --- a/libcloud/compute/drivers/softlayer.py +++ b/libcloud/compute/drivers/softlayer.py @@ -242,7 +242,7 @@ def _to_node(self, host): return Node( id=host['id'], - name=host['hostname'], + name=host['fullyQualifiedDomainName'], state=state, public_ips=public_ips, private_ips=private_ips, From 0eb87f83e2d39b7cf1c92a30d6312bab84f08c75 Mon Sep 17 00:00:00 2001 From: Roel Van Nyen Date: Wed, 23 Apr 2014 11:49:50 +0200 Subject: [PATCH 2/2] Fix hostname tests for softlayer compute. --- libcloud/test/compute/test_softlayer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcloud/test/compute/test_softlayer.py b/libcloud/test/compute/test_softlayer.py index 4d1d9f845e..74f4a3278b 100644 --- a/libcloud/test/compute/test_softlayer.py +++ b/libcloud/test/compute/test_softlayer.py @@ -43,7 +43,7 @@ def setUp(self): def test_list_nodes(self): nodes = self.driver.list_nodes() node = nodes[0] - self.assertEqual(node.name, 'libcloud-testing1') + self.assertEqual(node.name, 'libcloud-testing1.example.com') self.assertEqual(node.state, NodeState.RUNNING) self.assertEqual(node.extra['password'], 'L3TJVubf') @@ -73,7 +73,7 @@ def test_create_node(self): 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.name, 'libcloud-testing.example.com') self.assertEqual(node.state, NODE_STATE_MAP['RUNNING']) def test_create_fail(self):