Repository: libcloud Updated Branches: refs/heads/trunk 65e0bfbc1 -> 7e9c607e1
Added image_id and size_id fields when calling DigitalOcean driver's list_nodes method Closes #355 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/bd37d5c6 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/bd37d5c6 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/bd37d5c6 Branch: refs/heads/trunk Commit: bd37d5c6f3a813e8c4b6cf8133b7a65493bd886e Parents: 65e0bfb Author: Sherif Zain <[email protected]> Authored: Wed Sep 3 12:35:51 2014 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Wed Sep 3 13:21:12 2014 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/digitalocean.py | 2 +- libcloud/test/compute/test_digitalocean.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/bd37d5c6/libcloud/compute/drivers/digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/digitalocean.py b/libcloud/compute/drivers/digitalocean.py index 7dbed41..4ec6da1 100644 --- a/libcloud/compute/drivers/digitalocean.py +++ b/libcloud/compute/drivers/digitalocean.py @@ -178,7 +178,7 @@ class DigitalOceanNodeDriver(NodeDriver): return res.status == httplib.OK def _to_node(self, data): - extra_keys = ['backups_active', 'region_id'] + extra_keys = ['backups_active', 'region_id', 'image_id', 'size_id'] if 'status' in data: state = self.NODE_STATE_MAP.get(data['status'], NodeState.UNKNOWN) else: http://git-wip-us.apache.org/repos/asf/libcloud/blob/bd37d5c6/libcloud/test/compute/test_digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_digitalocean.py b/libcloud/test/compute/test_digitalocean.py index ee9ef55..ff4159b 100644 --- a/libcloud/test/compute/test_digitalocean.py +++ b/libcloud/test/compute/test_digitalocean.py @@ -79,6 +79,8 @@ class DigitalOceanTests(LibcloudTestCase): self.assertEqual(len(nodes), 1) self.assertEqual(nodes[0].name, 'test-2') self.assertEqual(nodes[0].public_ips, []) + self.assertEqual(nodes[0].extra['image_id'], 1601) + self.assertEqual(nodes[0].extra['size_id'], 66) def test_create_node_invalid_size(self): image = NodeImage(id='invalid', name=None, driver=self.driver)
