You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/04/29 01:09:21 UTC
[1/6] libcloud git commit: Additional fields in extra dict of Vultr
sizes
Repository: libcloud
Updated Branches:
refs/heads/trunk d80981463 -> f1962e83c
Additional fields in extra dict of Vultr sizes
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7adbdd8f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7adbdd8f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7adbdd8f
Branch: refs/heads/trunk
Commit: 7adbdd8fdfb0347d30075c35c4bcc0d6475649e2
Parents: c62d7c9
Author: Francisco Ros <fj...@doalitic.com>
Authored: Mon Apr 24 19:11:07 2017 +0200
Committer: Francisco Ros <fj...@doalitic.com>
Committed: Mon Apr 24 19:11:07 2017 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/vultr.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7adbdd8f/libcloud/compute/drivers/vultr.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/vultr.py b/libcloud/compute/drivers/vultr.py
index 0313144..52251aa 100644
--- a/libcloud/compute/drivers/vultr.py
+++ b/libcloud/compute/drivers/vultr.py
@@ -300,7 +300,11 @@ class VultrNodeDriver(NodeDriver):
country=data['country'], driver=self)
def _to_size(self, data):
- extra = {'vcpu_count': int(data['vcpu_count'])}
+ extra = {
+ 'vcpu_count': int(data['vcpu_count']),
+ 'plan_type': data['plan_type'],
+ 'available_locations': data['available_locations']
+ }
ram = int(data['ram'])
disk = int(data['disk'])
bandwidth = float(data['bandwidth'])
[2/6] libcloud git commit: Update sizes fixture in Vultr compute
driver
Posted by an...@apache.org.
Update sizes fixture in Vultr compute driver
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/901bfcc6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/901bfcc6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/901bfcc6
Branch: refs/heads/trunk
Commit: 901bfcc6f05cfe0515befd0de5aa59011b1cc52f
Parents: 0a25102
Author: Francisco Ros <fj...@doalitic.com>
Authored: Tue Apr 25 16:11:58 2017 +0200
Committer: Francisco Ros <fj...@doalitic.com>
Committed: Tue Apr 25 16:15:55 2017 +0200
----------------------------------------------------------------------
libcloud/test/compute/fixtures/vultr/list_sizes.json | 2 +-
libcloud/test/compute/test_vultr.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/901bfcc6/libcloud/test/compute/fixtures/vultr/list_sizes.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/vultr/list_sizes.json b/libcloud/test/compute/fixtures/vultr/list_sizes.json
index ded841d..af78116 100644
--- a/libcloud/test/compute/fixtures/vultr/list_sizes.json
+++ b/libcloud/test/compute/fixtures/vultr/list_sizes.json
@@ -1 +1 @@
-{"31":{"VPSPLANID":"31","name":"768 MB RAM,15 GB SSD,0.20 TB BW","vcpu_count":"1","ram":"768","disk":"15","bandwidth":"0.20","bandwidth_gb":"204.8","price_per_month":"5.00","windows":false},"29":{"VPSPLANID":"29","name":"768 MB RAM,15 GB SSD,1.00 TB BW","vcpu_count":"1","ram":"768","disk":"15","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"5.00","windows":false},"32":{"VPSPLANID":"32","name":"1024 MB RAM,20 GB SSD,0.40 TB BW","vcpu_count":"1","ram":"1024","disk":"20","bandwidth":"0.40","bandwidth_gb":"409.6","price_per_month":"7.00","windows":false},"30":{"VPSPLANID":"30","name":"1024 MB RAM,20 GB SSD,2.00 TB BW","vcpu_count":"1","ram":"1024","disk":"20","bandwidth":"2.00","bandwidth_gb":"2048","price_per_month":"7.00","windows":false},"3":{"VPSPLANID":"3","name":"2048 MB RAM,40 GB SSD,3.00 TB BW","vcpu_count":"2","ram":"2048","disk":"40","bandwidth":"3.00","bandwidth_gb":"3072","price_per_month":"15.00","windows":false},"8":{"VPSPLANID":"8","name":"2048 MB RAM,40 GB SS
D,0.60 TB BW","vcpu_count":"2","ram":"2048","disk":"40","bandwidth":"0.60","bandwidth_gb":"614.4","price_per_month":"15.00","windows":false},"33":{"VPSPLANID":"33","name":"4096 MB RAM,65 GB SSD,0.80 TB BW","vcpu_count":"2","ram":"4096","disk":"65","bandwidth":"0.80","bandwidth_gb":"819.2","price_per_month":"35.00","windows":false},"27":{"VPSPLANID":"27","name":"4096 MB RAM,65 GB SSD,4.00 TB BW","vcpu_count":"2","ram":"4096","disk":"65","bandwidth":"4.00","bandwidth_gb":"4096","price_per_month":"35.00","windows":false},"28":{"VPSPLANID":"28","name":"8192 MB RAM,120 GB SSD,5.00 TB BW","vcpu_count":"4","ram":"8192","disk":"120","bandwidth":"5.00","bandwidth_gb":"5120","price_per_month":"70.00","windows":false},"34":{"VPSPLANID":"34","name":"8192 MB RAM,120 GB SSD,1.00 TB BW","vcpu_count":"4","ram":"8192","disk":"120","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"70.00","windows":false},"11":{"VPSPLANID":"11","name":"512 MB RAM,160 GB SATA,1.00 TB BW","vcpu_count":"1","ram
":"512","disk":"160","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"5.00","windows":false},"78":{"VPSPLANID":"78","name":"16384 MB RAM,250 GB SSD,6.00 TB BW","vcpu_count":"8","ram":"16384","disk":"250","bandwidth":"6.00","bandwidth_gb":"6144","price_per_month":"149.95","windows":false},"71":{"VPSPLANID":"71","name":"16384 MB RAM,250 GB SSD,8.00 TB BW","vcpu_count":"4","ram":"16384","disk":"250","bandwidth":"8.00","bandwidth_gb":"8192","price_per_month":"125.00","windows":false},"68":{"VPSPLANID":"68","name":"16384 MB RAM,250 GB SSD,1.60 TB BW","vcpu_count":"4","ram":"16384","disk":"250","bandwidth":"1.60","bandwidth_gb":"1638.4","price_per_month":"125.00","windows":false},"12":{"VPSPLANID":"12","name":"1024 MB RAM,320 GB SATA,2.00 TB BW","vcpu_count":"1","ram":"1024","disk":"320","bandwidth":"2.00","bandwidth_gb":"2048","price_per_month":"8.00","windows":false},"62":{"VPSPLANID":"62","name":"1024 MB RAM,320 GB SATAPERF,1.00 TB BW, 10GigE","vcpu_count":"1","ram":"1024","
disk":"320","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"15.00","windows":false},"79":{"VPSPLANID":"79","name":"32768 MB RAM,400 GB SSD,7.00 TB BW","vcpu_count":"12","ram":"32768","disk":"400","bandwidth":"7.00","bandwidth_gb":"7168","price_per_month":"299.95","windows":false},"80":{"VPSPLANID":"80","name":"49152 MB RAM,600 GB SSD,8.00 TB BW","vcpu_count":"16","ram":"49152","disk":"600","bandwidth":"8.00","bandwidth_gb":"8192","price_per_month":"429.95","windows":false},"13":{"VPSPLANID":"13","name":"2048 MB RAM,640 GB SATA,3.00 TB BW","vcpu_count":"1","ram":"2048","disk":"640","bandwidth":"3.00","bandwidth_gb":"3072","price_per_month":"15.00","windows":false},"63":{"VPSPLANID":"63","name":"2048 MB RAM,640 GB SATAPERF,2.00 TB BW, 10GigE","vcpu_count":"1","ram":"2048","disk":"640","bandwidth":"2.00","bandwidth_gb":"2048","price_per_month":"25.00","windows":false},"81":{"VPSPLANID":"81","name":"65536 MB RAM,800 GB SSD,9.00 TB BW","vcpu_count":"24","ram":"65536","disk":"
800","bandwidth":"9.00","bandwidth_gb":"9216","price_per_month":"599.95","windows":false},"64":{"VPSPLANID":"64","name":"4096 MB RAM,1280 GB SATAPERF,3.00 TB BW, 10GigE","vcpu_count":"2","ram":"4096","disk":"1280","bandwidth":"3.00","bandwidth_gb":"3072","price_per_month":"50.00","windows":false}}
\ No newline at end of file
+{"201":{"VPSPLANID":"201","name":"1024 MB RAM,25 GB SSD,1.00 TB BW","vcpu_count":"1","ram":"1024","disk":"25","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"5.00","plan_type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,7,8,9,12,19,24,25,39,40]},"202":{"VPSPLANID":"202","name":"2048 MB RAM,40 GB SSD,2.00 TB BW","vcpu_count":"1","ram":"2048","disk":"40","bandwidth":"2.00","bandwidth_gb":"2048","price_per_month":"10.00","plan_type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,7,8,9,12,19,24,25,39,40]},"203":{"VPSPLANID":"203","name":"4096 MB RAM,60 GB SSD,3.00 TB BW","vcpu_count":"2","ram":"4096","disk":"60","bandwidth":"3.00","bandwidth_gb":"3072","price_per_month":"20.00","plan_type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,7,8,9,12,19,24,25,39,40]},"204":{"VPSPLANID":"204","name":"8192 MB RAM,100 GB SSD,4.00 TB BW","vcpu_count":"4","ram":"8192","disk":"100","bandwidth":"4.00","bandwidth_gb":"4096","price_per_month":"40.00","plan_
type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,7,8,9,12,19,24,25,39,40]},"205":{"VPSPLANID":"205","name":"16384 MB RAM,200 GB SSD,5.00 TB BW","vcpu_count":"6","ram":"16384","disk":"200","bandwidth":"5.00","bandwidth_gb":"5120","price_per_month":"80.00","plan_type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,8,9,12,19,24,25,39,40]},"206":{"VPSPLANID":"206","name":"32768 MB RAM,300 GB SSD,6.00 TB BW","vcpu_count":"8","ram":"32768","disk":"300","bandwidth":"6.00","bandwidth_gb":"6144","price_per_month":"160.00","plan_type":"SSD","windows":false,"available_locations":[1,2,3,4,5,6,8,9,12,19,24,25,39,40]},"207":{"VPSPLANID":"207","name":"65536 MB RAM,400 GB SSD,10.00 TB BW","vcpu_count":"16","ram":"65536","disk":"400","bandwidth":"10.00","bandwidth_gb":"10240","price_per_month":"320.00","plan_type":"SSD","windows":false,"available_locations":[2,3,4,6,8,9,12,19,24,39,40]},"208":{"VPSPLANID":"208","name":"98304 MB RAM,800 GB SSD,15.00 TB BW","vcpu_count":"24","r
am":"98304","disk":"800","bandwidth":"15.00","bandwidth_gb":"15360","price_per_month":"640.00","plan_type":"SSD","windows":false,"available_locations":[2,3,4,6,9,12,19,39]},"87":{"VPSPLANID":"87","name":"512 MB RAM,125 GB SATA,1.00 TB BW","vcpu_count":"1","ram":"512","disk":"125","bandwidth":"1.00","bandwidth_gb":"1024","price_per_month":"5.00","plan_type":"SATA","windows":false,"available_locations":[5,7]},"88":{"VPSPLANID":"88","name":"1024 MB RAM,250 GB SATA,2.00 TB BW","vcpu_count":"1","ram":"1024","disk":"250","bandwidth":"2.00","bandwidth_gb":"2048","price_per_month":"10.00","plan_type":"SATA","windows":false,"available_locations":[]},"89":{"VPSPLANID":"89","name":"2048 MB RAM,500 GB SATA,3.00 TB BW","vcpu_count":"1","ram":"2048","disk":"500","bandwidth":"3.00","bandwidth_gb":"3072","price_per_month":"20.00","plan_type":"SATA","windows":false,"available_locations":[]},"90":{"VPSPLANID":"90","name":"3072 MB RAM,750 GB SATA,4.00 TB BW","vcpu_count":"2","ram":"3072","disk":"750",
"bandwidth":"4.00","bandwidth_gb":"4096","price_per_month":"30.00","plan_type":"SATA","windows":false,"available_locations":[]},"91":{"VPSPLANID":"91","name":"4096 MB RAM,1000 GB SATA,5.00 TB BW","vcpu_count":"2","ram":"4096","disk":"1000","bandwidth":"5.00","bandwidth_gb":"5120","price_per_month":"40.00","plan_type":"SATA","windows":false,"available_locations":[]},"115":{"VPSPLANID":"115","name":"8192 MB RAM,110 GB SSD,10.00 TB BW","vcpu_count":"2","ram":"8192","disk":"110","bandwidth":"10.00","bandwidth_gb":"10240","price_per_month":"60.00","plan_type":"DEDICATED","windows":false,"available_locations":[1,2,25]},"116":{"VPSPLANID":"116","name":"16384 MB RAM,110 GB SSD,20.00 TB BW","vcpu_count":"4","ram":"16384","disk":"110","bandwidth":"20.00","bandwidth_gb":"20480","price_per_month":"120.00","plan_type":"DEDICATED","windows":false,"available_locations":[2]},"117":{"VPSPLANID":"117","name":"24576 MB RAM,110 GB SSD,30.00 TB BW","vcpu_count":"6","ram":"24576","disk":"110","bandwidth"
:"30.00","bandwidth_gb":"30720","price_per_month":"180.00","plan_type":"DEDICATED","windows":false,"available_locations":[2]},"118":{"VPSPLANID":"118","name":"32768 MB RAM,110 GB SSD,40.00 TB BW","vcpu_count":"8","ram":"32768","disk":"110","bandwidth":"40.00","bandwidth_gb":"40960","price_per_month":"240.00","plan_type":"DEDICATED","windows":false,"available_locations":[2]}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/901bfcc6/libcloud/test/compute/test_vultr.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_vultr.py b/libcloud/test/compute/test_vultr.py
index afa4fdb..d416383 100644
--- a/libcloud/test/compute/test_vultr.py
+++ b/libcloud/test/compute/test_vultr.py
@@ -47,17 +47,17 @@ class VultrTests(LibcloudTestCase):
def test_list_sizes_success(self):
sizes = self.driver.list_sizes()
- self.assertTrue(len(sizes) == 22)
+ self.assertTrue(len(sizes) == 17)
size = sizes[0]
self.assertTrue(size.id is not None)
- self.assertEqual(size.name, '512 MB RAM,160 GB SATA,1.00 TB BW')
- self.assertEqual(size.ram, 512)
+ self.assertEqual(size.name, '8192 MB RAM,110 GB SSD,10.00 TB BW')
+ self.assertEqual(size.ram, 8192)
- size = sizes[21]
+ size = sizes[16]
self.assertTrue(size.id is not None)
- self.assertEqual(size.name, '65536 MB RAM,800 GB SSD,9.00 TB BW')
- self.assertEqual(size.ram, 65536)
+ self.assertEqual(size.name, '4096 MB RAM,1000 GB SATA,5.00 TB BW')
+ self.assertEqual(size.ram, 4096)
def test_list_locations_success(self):
locations = self.driver.list_locations()
[6/6] libcloud git commit: changes for #1044
Posted by an...@apache.org.
changes for #1044
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f1962e83
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f1962e83
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f1962e83
Branch: refs/heads/trunk
Commit: f1962e83c82475a3a78d312ba16035e2193e100b
Parents: 222acf2
Author: Anthony Shaw <an...@apache.org>
Authored: Sat Apr 29 11:09:13 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 29 11:09:13 2017 +1000
----------------------------------------------------------------------
CHANGES.rst | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f1962e83/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index 08a71ad..d47ea9c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,13 @@ Common
[GITHUB-1038]
(Anthony Shaw)
+Compute
+~~~~~~~
+
+- [VULTR] Extend extra dict of Vultr sizes to include additional fields (plan_type and available_locations)
+ [GITHUB-1044]
+ (Francisco Ros)
+
Container
~~~~~~~~~
[4/6] libcloud git commit: Merge branch 'extra-vultr-size-params' of
github.com:fjros/libcloud into extra-vultr-size-params
Posted by an...@apache.org.
Merge branch 'extra-vultr-size-params' of github.com:fjros/libcloud into extra-vultr-size-params
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/23834bd5
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/23834bd5
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/23834bd5
Branch: refs/heads/trunk
Commit: 23834bd5fa072730fb8c1cd1d8bf29be4a224817
Parents: 901bfcc 7adbdd8
Author: Francisco Ros <fj...@doalitic.com>
Authored: Tue Apr 25 16:17:01 2017 +0200
Committer: Francisco Ros <fj...@doalitic.com>
Committed: Tue Apr 25 16:17:01 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] libcloud git commit: Merge branch 'github-1044' into trunk
Closes #1044
Posted by an...@apache.org.
Merge branch 'github-1044' into trunk
Closes #1044
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/222acf22
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/222acf22
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/222acf22
Branch: refs/heads/trunk
Commit: 222acf22e8269164e9dbfc0519cfe51f1ad4d40b
Parents: d809814 23834bd
Author: Anthony Shaw <an...@apache.org>
Authored: Sat Apr 29 11:08:07 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 29 11:08:07 2017 +1000
----------------------------------------------------------------------
libcloud/compute/drivers/vultr.py | 6 +++++-
libcloud/test/compute/fixtures/vultr/list_sizes.json | 2 +-
libcloud/test/compute/test_vultr.py | 12 ++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/6] libcloud git commit: Additional fields in extra dict of Vultr
sizes
Posted by an...@apache.org.
Additional fields in extra dict of Vultr sizes
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0a251020
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0a251020
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0a251020
Branch: refs/heads/trunk
Commit: 0a2510205870685baf7d76337232a2a0d484d3e7
Parents: 4510153
Author: Francisco Ros <fj...@doalitic.com>
Authored: Mon Apr 24 19:11:07 2017 +0200
Committer: Francisco Ros <fj...@doalitic.com>
Committed: Tue Apr 25 16:15:55 2017 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/vultr.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0a251020/libcloud/compute/drivers/vultr.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/vultr.py b/libcloud/compute/drivers/vultr.py
index 0313144..52251aa 100644
--- a/libcloud/compute/drivers/vultr.py
+++ b/libcloud/compute/drivers/vultr.py
@@ -300,7 +300,11 @@ class VultrNodeDriver(NodeDriver):
country=data['country'], driver=self)
def _to_size(self, data):
- extra = {'vcpu_count': int(data['vcpu_count'])}
+ extra = {
+ 'vcpu_count': int(data['vcpu_count']),
+ 'plan_type': data['plan_type'],
+ 'available_locations': data['available_locations']
+ }
ram = int(data['ram'])
disk = int(data['disk'])
bandwidth = float(data['bandwidth'])