You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by qu...@apache.org on 2018/01/20 07:18:39 UTC
[1/2] libcloud git commit: Add support for DigitalOcean tags in
list_nodes()
Repository: libcloud
Updated Branches:
refs/heads/trunk 70bf36fb2 -> fd1162844
Add support for DigitalOcean tags in list_nodes()
Signed-off-by: Quentin Pradet <qu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/116ad85f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/116ad85f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/116ad85f
Branch: refs/heads/trunk
Commit: 116ad85fde1b5b4a1e466617af5cabb4067eef13
Parents: 70bf36f
Author: Mike Fischer <mi...@gmail.com>
Authored: Tue Dec 5 15:18:42 2017 -0500
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 11:16:19 2018 +0400
----------------------------------------------------------------------
libcloud/compute/drivers/digitalocean.py | 3 ++-
libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json | 6 +++++-
.../compute/fixtures/digitalocean_v2/list_nodes_page_1.json | 6 +++++-
libcloud/test/compute/test_digitalocean_v2.py | 1 +
4 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/116ad85f/libcloud/compute/drivers/digitalocean.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/digitalocean.py b/libcloud/compute/drivers/digitalocean.py
index 4063c28..c8acdf0 100644
--- a/libcloud/compute/drivers/digitalocean.py
+++ b/libcloud/compute/drivers/digitalocean.py
@@ -462,7 +462,8 @@ class DigitalOcean_v2_NodeDriver(DigitalOcean_v2_BaseDriver,
def _to_node(self, data):
extra_keys = ['memory', 'vcpus', 'disk', 'region', 'image',
'size_slug', 'locked', 'created_at', 'networks',
- 'kernel', 'backup_ids', 'snapshot_ids', 'features']
+ 'kernel', 'backup_ids', 'snapshot_ids', 'features',
+ 'tags']
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/116ad85f/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json b/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json
index b14ae88..670fa92 100644
--- a/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json
+++ b/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes.json
@@ -79,7 +79,11 @@
"metadata"
],
"available": null
- }
+ },
+ "tags": [
+ "environment:prod",
+ "database"
+ ]
}
],
"links": {},
http://git-wip-us.apache.org/repos/asf/libcloud/blob/116ad85f/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json b/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json
index fb6fb08..6f0c030 100644
--- a/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json
+++ b/libcloud/test/compute/fixtures/digitalocean_v2/list_nodes_page_1.json
@@ -79,7 +79,11 @@
"metadata"
],
"available": null
- }
+ },
+ "tags": [
+ "environment:prod",
+ "database"
+ ]
}
],
"links": {
http://git-wip-us.apache.org/repos/asf/libcloud/blob/116ad85f/libcloud/test/compute/test_digitalocean_v2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_digitalocean_v2.py b/libcloud/test/compute/test_digitalocean_v2.py
index 8589571..c0065e7 100644
--- a/libcloud/test/compute/test_digitalocean_v2.py
+++ b/libcloud/test/compute/test_digitalocean_v2.py
@@ -94,6 +94,7 @@ class DigitalOcean_v2_Tests(LibcloudTestCase):
self.assertEqual(nodes[0].public_ips, ['104.236.32.182'])
self.assertEqual(nodes[0].extra['image']['id'], 6918990)
self.assertEqual(nodes[0].extra['size_slug'], '512mb')
+ self.assertEqual(len(nodes[0].extra['tags']), 2)
def test_list_nodes_fills_created_datetime(self):
nodes = self.driver.list_nodes()
[2/2] libcloud git commit: Add changes for #1149
Posted by qu...@apache.org.
Add changes for #1149
Closes #1149
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fd116284
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fd116284
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fd116284
Branch: refs/heads/trunk
Commit: fd116284482145ffb43f82ba0b6d10fc19b4fc85
Parents: 116ad85
Author: Quentin Pradet <qu...@apache.org>
Authored: Sat Jan 20 11:16:28 2018 +0400
Committer: Quentin Pradet <qu...@apache.org>
Committed: Sat Jan 20 11:16:28 2018 +0400
----------------------------------------------------------------------
CHANGES.rst | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fd116284/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index afc74ec..1e4a19a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -129,6 +129,10 @@ Compute
- [GCE] Add support for accelerators (LIBCLOUD-963, GITHUB-1163)
[Michael Johnson]
+- [Digital Ocean] Add support for tags in list_nodes()
+ (LIBCLOUD-967, GITHUB-1149)
+ [Mike Fischer]
+
Storage
~~~~~~~