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 2013/01/22 22:53:13 UTC
svn commit: r1437202 - in /libcloud/trunk/libcloud: compute/drivers/ec2.py
data/pricing.json test/compute/test_ec2.py
Author: tomaz
Date: Tue Jan 22 21:53:12 2013
New Revision: 1437202
URL: http://svn.apache.org/viewvc?rev=1437202&view=rev
Log:
Add new "cr1.8xlarge" instance type to AWS EC2 compute driver.
Modified:
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/data/pricing.json
libcloud/trunk/libcloud/test/compute/test_ec2.py
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1437202&r1=1437201&r2=1437202&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Tue Jan 22 21:53:12 2013
@@ -150,6 +150,13 @@ INSTANCE_TYPES = {
'disk': 3370,
'bandwidth': None
},
+ 'cr1.8xlarge': {
+ 'id': 'cr1.8xlarge',
+ 'name': 'High Memory Cluster Eight Extra Large',
+ 'ram': 244000,
+ 'disk': 240, # 2 x 120 GB SSD
+ 'bandwidth': None
+ },
'hs1.8xlarge': {
'id': 'hs1.8xlarge',
'name': 'High Storage Eight Extra Large Instance',
@@ -180,6 +187,7 @@ REGION_DETAILS = {
'cc1.4xlarge',
'cc2.8xlarge',
'cg1.4xlarge',
+ 'cr1.8xlarge',
'hs1.8xlarge'
]
},
Modified: libcloud/trunk/libcloud/data/pricing.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1437202&r1=1437201&r2=1437202&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Tue Jan 22 21:53:12 2013
@@ -62,6 +62,7 @@
"cg1.4xlarge": 2.1,
"cc1.4xlarge": 1.3,
"cc2.8xlarge": 2.4,
+ "cr1.8xlarge": 3.50,
"hs1.8xlarge": 4.6
},
Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1437202&r1=1437201&r2=1437202&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Tue Jan 22 21:53:12 2013
@@ -223,10 +223,11 @@ class EC2Tests(LibcloudTestCase, TestCas
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 16)
+ self.assertEqual(len(sizes), 17)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
+ self.assertTrue('cr1.8xlarge' in ids)
elif region_name == 'eu-west-1':
self.assertEqual(len(sizes), 11)
else: