Add new r3 instance types to the EC2 driver.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/04884dca Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/04884dca Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/04884dca Branch: refs/heads/trunk Commit: 04884dca384de6b849bf23c2ce395bf1017894c6 Parents: b9b3f08 Author: Tomaz Muraus <[email protected]> Authored: Thu Apr 10 14:50:26 2014 -0400 Committer: Tomaz Muraus <[email protected]> Committed: Thu Apr 10 14:50:26 2014 -0400 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 66 ++++++++++++++++++++++++++++++++++ libcloud/test/compute/test_ec2.py | 10 +++--- 2 files changed, 71 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/04884dca/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 884e8ba..6c5e10d 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -290,6 +290,42 @@ INSTANCE_TYPES = { 'disk': 6400, 'bandwidth': None }, + # 1x SSD + 'r3.large': { + 'id': 'r3.large', + 'name': 'Memory Optimized Large instance', + 'ram': 15000, + 'disk': 32, + 'bandwidth': None + }, + 'r3.xlarge': { + 'id': 'r3.xlarge', + 'name': 'Memory Optimized Extra Large instance', + 'ram': 30500, + 'disk': 80, + 'bandwidth': None + }, + 'r3.2xlarge': { + 'id': 'r3.2xlarge', + 'name': 'Memory Optimized Double Extra Large instance', + 'ram': 61000, + 'disk': 160, + 'bandwidth': None + }, + 'r3.4xlarge': { + 'id': 'r3.4xlarge', + 'name': 'Memory Optimized Quadruple Extra Large instance', + 'ram': 122000, + 'disk': 320, + 'bandwidth': None + }, + 'r3.8xlarge': { + 'id': 'r3.8xlarge', + 'name': 'Memory Optimized Eight Extra Large instance', + 'ram': 244000, + 'disk': 320, # x2 + 'bandwidth': None + } } REGION_DETAILS = { @@ -327,6 +363,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, # US West (Northern California) Region @@ -359,6 +400,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, # US West (Oregon) Region @@ -389,6 +435,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, # EU (Ireland) Region @@ -423,6 +474,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, # Asia Pacific (Singapore) Region @@ -488,6 +544,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, # South America (Sao Paulo) Region @@ -542,6 +603,11 @@ REGION_DETAILS = { 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge' ] }, 'nimbus': { http://git-wip-us.apache.org/repos/asf/libcloud/blob/04884dca/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index de2eeb3..6d66545 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -372,20 +372,20 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 28) + self.assertEqual(len(sizes), 33) 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), 24) + self.assertEqual(len(sizes), 29) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 24) + self.assertEqual(len(sizes), 29) elif region_name == 'ap-southeast-1': self.assertEqual(len(sizes), 24) elif region_name == 'ap-southeast-2': - self.assertEqual(len(sizes), 24) + self.assertEqual(len(sizes), 29) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 26) + self.assertEqual(len(sizes), 31) self.driver.region_name = region_old
