You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/03/31 23:09:42 UTC
[3/4] libcloud git commit: Add new d4. instance types to the EC2
driver.
Add new d4. instance types to the EC2 driver.
Also update affected tests.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fbc19273
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fbc19273
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fbc19273
Branch: refs/heads/trunk
Commit: fbc19273dc46deb9eac7767be2f06642693663fe
Parents: 50b754a
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Mar 31 21:25:21 2015 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Mar 31 21:26:55 2015 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 56 ++++++++++++++++++++++++++++++++++
libcloud/test/compute/test_ec2.py | 8 ++---
2 files changed, 60 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fbc19273/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 99c7419..5c4763e 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -303,6 +303,34 @@ INSTANCE_TYPES = {
'disk': 6400,
'bandwidth': None
},
+ 'd2.xlarge': {
+ 'id': 'd2.xlarge',
+ 'name': 'High Storage Optimized Extra Large Instance',
+ 'ram': 30050,
+ 'disk': 6000, # 3 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.2xlarge': {
+ 'id': 'd2.2xlarge',
+ 'name': 'High Storage Optimized Double Extra Large Instance',
+ 'ram': 61952,
+ 'disk': 12000, # 6 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.4xlarge': {
+ 'id': 'd2.4xlarge',
+ 'name': 'High Storage Optimized Quadruple Extra Large Instance',
+ 'ram': 122000,
+ 'disk': 24000, # 12 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.8xlarge': {
+ 'id': 'd2.8xlarge',
+ 'name': 'High Storage Optimized Eight Extra Large Instance',
+ 'ram': 244000,
+ 'disk': 48000, # 24 x 2 TB
+ 'bandwidth': None
+ },
# 1x SSD
'r3.large': {
'id': 'r3.large',
@@ -408,6 +436,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -492,6 +524,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -535,6 +571,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -565,6 +605,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -606,6 +650,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
't2.micro',
't2.small',
't2.medium'
@@ -643,6 +691,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -710,6 +762,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fbc19273/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 9ad0a0b..6a5cdeb 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -382,7 +382,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 36)
+ self.assertEqual(len(sizes), 40)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
self.assertTrue('cr1.8xlarge' in ids)
@@ -391,11 +391,11 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
if region_name == 'us-west-2':
self.assertEqual(len(sizes), 29)
elif region_name == 'ap-southeast-1':
- self.assertEqual(len(sizes), 27)
+ self.assertEqual(len(sizes), 31)
elif region_name == 'ap-southeast-2':
- self.assertEqual(len(sizes), 32)
+ self.assertEqual(len(sizes), 36)
elif region_name == 'eu-west-1':
- self.assertEqual(len(sizes), 34)
+ self.assertEqual(len(sizes), 38)
self.driver.region_name = region_old