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 2015/11/22 06:53:09 UTC
[1/3] libcloud git commit: adding support for c4 instance types
Repository: libcloud
Updated Branches:
refs/heads/trunk 3f77deaeb -> ee4f7ef17
adding support for c4 instance types
Signed-off-by: Anthony Shaw <an...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/09613905
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/09613905
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/09613905
Branch: refs/heads/trunk
Commit: 0961390552637c3f5a898f614f41a35f3f067be8
Parents: 3f77dea
Author: Amit <am...@onefinestay.com>
Authored: Sun Nov 22 01:19:41 2015 +0000
Committer: Anthony Shaw <an...@gmail.com>
Committed: Sun Nov 22 16:41:23 2015 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 81 ++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/09613905/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 312ec44..eb3bc7b 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -295,6 +295,41 @@ INSTANCE_TYPES = {
'disk': 240,
'bandwidth': None
},
+ 'c4.large': {
+ 'id': 'c4.large',
+ 'name': 'Compute Optimized Large Instance',
+ 'ram': 3750,
+ 'disk': 0,
+ 'bandwidth': None
+ },
+ 'c4.xlarge': {
+ 'id': 'c4.xlarge',
+ 'name': 'Compute Optimized Double Extra Large Instance',
+ 'ram': 7500,
+ 'disk': 0,
+ 'bandwidth': None
+ },
+ 'c4.2xlarge': {
+ 'id': 'c4.2xlarge',
+ 'name': 'Compute Optimized Extra Large Instance',
+ 'ram': 15000,
+ 'disk': 0,
+ 'bandwidth': None
+ },
+ 'c4.4xlarge': {
+ 'id': 'c4.4xlarge',
+ 'name': 'Compute Optimized Quadruple Extra Large Instance',
+ 'ram': 30000,
+ 'disk': 0,
+ 'bandwidth': None
+ },
+ 'c4.8xlarge': {
+ 'id': 'c4.8xlarge',
+ 'name': 'Compute Optimized Eight Extra Large Instance',
+ 'ram': 60000,
+ 'disk': 0,
+ 'bandwidth': None
+ },
'hs1.4xlarge': {
'id': 'hs1.4xlarge',
'name': 'High Storage Quadruple Extra Large Instance',
@@ -468,6 +503,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'cg1.4xlarge',
'g2.2xlarge',
'cr1.8xlarge',
@@ -522,6 +562,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'i2.xlarge',
'i2.2xlarge',
'i2.4xlarge',
@@ -568,6 +613,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
@@ -620,6 +670,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
@@ -655,6 +710,11 @@ REGION_DETAILS = {
'c3.xlarge',
'c3.2xlarge',
'c3.4xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'm4.large',
'm4.xlarge',
'm4.2xlarge',
@@ -710,6 +770,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
@@ -751,6 +816,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'm4.large',
'm4.xlarge',
'm4.2xlarge',
@@ -832,6 +902,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
@@ -877,6 +952,11 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'c4.large',
+ 'c4.xlarge',
+ 'c4.2xlarge',
+ 'c4.4xlarge',
+ 'c4.8xlarge',
'hs1.4xlarge',
'hs1.8xlarge',
'i2.xlarge',
@@ -2238,6 +2318,7 @@ class BaseEC2NodeDriver(NodeDriver):
attributes = copy.deepcopy(attributes)
price = self._get_size_price(size_id=instance_type)
attributes.update({'price': price})
+ print attributes
sizes.append(NodeSize(driver=self, **attributes))
return sizes
[3/3] libcloud git commit: reoder c4 instances Closes #638
Signed-off-by: Anthony Shaw
Posted by an...@apache.org.
reoder c4 instances
Closes #638
Signed-off-by: Anthony Shaw <an...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ee4f7ef1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ee4f7ef1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ee4f7ef1
Branch: refs/heads/trunk
Commit: ee4f7ef17b8cb6cba4ff34219335322dfdbb5381
Parents: 4ed24fd
Author: Amit <am...@onefinestay.com>
Authored: Sun Nov 22 01:33:11 2015 +0000
Committer: Anthony Shaw <an...@gmail.com>
Committed: Sun Nov 22 16:51:05 2015 +1100
----------------------------------------------------------------------
CHANGES.rst | 4 ++++
libcloud/compute/drivers/ec2.py | 18 +++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ee4f7ef1/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index a655432..7d10c12 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -62,6 +62,10 @@ Compute
[GITHUB-634]
[Benjamin Zaitlen]
+- Added C4 instance information to EC2 driver
+ [GITHUB-638]
+ [amitofs]
+
- Allow location of the datacenter to be supplied in ProfitBricks driver
[LIBCLOUD-771, GITHUB-635]
[Joel Reymont]
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ee4f7ef1/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index eb3bc7b..3ddecb9 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -288,13 +288,6 @@ INSTANCE_TYPES = {
'disk': 640, # x2
'bandwidth': None
},
- 'cr1.8xlarge': {
- 'id': 'cr1.8xlarge',
- 'name': 'High Memory Cluster Eight Extra Large',
- 'ram': 244000,
- 'disk': 240,
- 'bandwidth': None
- },
'c4.large': {
'id': 'c4.large',
'name': 'Compute Optimized Large Instance',
@@ -304,14 +297,14 @@ INSTANCE_TYPES = {
},
'c4.xlarge': {
'id': 'c4.xlarge',
- 'name': 'Compute Optimized Double Extra Large Instance',
+ 'name': 'Compute Optimized Extra Large Instance',
'ram': 7500,
'disk': 0,
'bandwidth': None
},
'c4.2xlarge': {
'id': 'c4.2xlarge',
- 'name': 'Compute Optimized Extra Large Instance',
+ 'name': 'Compute Optimized Double Large Instance',
'ram': 15000,
'disk': 0,
'bandwidth': None
@@ -330,6 +323,13 @@ INSTANCE_TYPES = {
'disk': 0,
'bandwidth': None
},
+ 'cr1.8xlarge': {
+ 'id': 'cr1.8xlarge',
+ 'name': 'High Memory Cluster Eight Extra Large',
+ 'ram': 244000,
+ 'disk': 240,
+ 'bandwidth': None
+ },
'hs1.4xlarge': {
'id': 'hs1.4xlarge',
'name': 'High Storage Quadruple Extra Large Instance',
[2/3] libcloud git commit: updated tests
Posted by an...@apache.org.
updated tests
Signed-off-by: Anthony Shaw <an...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4ed24fd0
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4ed24fd0
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4ed24fd0
Branch: refs/heads/trunk
Commit: 4ed24fd0059b857728ff92d47a1f50d6d3deabe8
Parents: 0961390
Author: Amit <am...@onefinestay.com>
Authored: Sun Nov 22 01:19:52 2015 +0000
Committer: Anthony Shaw <an...@gmail.com>
Committed: Sun Nov 22 16:41:24 2015 +1100
----------------------------------------------------------------------
libcloud/test/compute/test_ec2.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/4ed24fd0/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index fdfba06..1b9ea61 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -415,20 +415,20 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 45)
+ self.assertEqual(len(sizes), 50)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
self.assertTrue('cr1.8xlarge' in ids)
elif region_name == 'us-west-1':
- self.assertEqual(len(sizes), 37)
+ self.assertEqual(len(sizes), 42)
if region_name == 'us-west-2':
- self.assertEqual(len(sizes), 34)
+ self.assertEqual(len(sizes), 39)
elif region_name == 'ap-southeast-1':
- self.assertEqual(len(sizes), 36)
- elif region_name == 'ap-southeast-2':
self.assertEqual(len(sizes), 41)
+ elif region_name == 'ap-southeast-2':
+ self.assertEqual(len(sizes), 46)
elif region_name == 'eu-west-1':
- self.assertEqual(len(sizes), 43)
+ self.assertEqual(len(sizes), 48)
self.driver.region_name = region_old