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 2011/11/16 03:53:12 UTC
svn commit: r1202516 - in /libcloud/trunk: ./ CHANGES
libcloud/compute/drivers/ec2.py libcloud/data/pricing.json
test/compute/test_ec2.py
Author: tomaz
Date: Wed Nov 16 02:53:11 2011
New Revision: 1202516
URL: http://svn.apache.org/viewvc?rev=1202516&view=rev
Log:
Add new "Cluster Compute Eight Extra Large" size to the Amazon EC2
driver.
Modified:
libcloud/trunk/ (props changed)
libcloud/trunk/CHANGES
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/data/pricing.json
libcloud/trunk/test/compute/test_ec2.py
Propchange: libcloud/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /libcloud/branches/0.6.x:1202005
Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1202516&r1=1202515&r2=1202516&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Wed Nov 16 02:53:11 2011
@@ -1,5 +1,12 @@
-*- coding: utf-8 -*-
+Changes with Apache Libcloud in development:
+ *) Compute:
+
+ - Add new "Cluster Compute Eight Extra Large" size to the Amazon EC2
+ driver.
+ [Tomaz Muraus]
+
Changes with Apache Libcloud 0.6.2:
*) General
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1202516&r1=1202515&r2=1202516&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Wed Nov 16 02:53:11 2011
@@ -131,9 +131,16 @@ EC2_INSTANCE_TYPES = {
'disk': 1690,
'bandwidth': None
},
+ 'cc2.8xlarge': {
+ 'id': 'cc2.8xlarge',
+ 'name': 'Cluster Compute Eight Extra Large Instance',
+ 'ram': 63488,
+ 'disk': 3370,
+ 'bandwidth': None
}
+}
-CLUSTER_INSTANCES_IDS = ['cg1.4xlarge', 'cc1.4xlarge']
+CLUSTER_INSTANCES_IDS = ['cg1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge']
EC2_US_EAST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
EC2_US_WEST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
Modified: libcloud/trunk/libcloud/data/pricing.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1202516&r1=1202515&r2=1202516&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Wed Nov 16 02:53:11 2011
@@ -36,7 +36,8 @@
"m2.2xlarge": 1.0,
"m2.4xlarge": 2.0,
"cg1.4xlarge": 2.1,
- "cc1.4xlarge": 1.6
+ "cc1.4xlarge": 1.6,
+ "cc2.8xlarge": 2.4
},
"ec2_us_west": {
Modified: libcloud/trunk/test/compute/test_ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_ec2.py?rev=1202516&r1=1202515&r2=1202516&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_ec2.py (original)
+++ libcloud/trunk/test/compute/test_ec2.py Wed Nov 16 02:53:11 2011
@@ -156,9 +156,10 @@ class EC2Tests(LibcloudTestCase, TestCas
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 11)
+ self.assertEqual(len(sizes), 12)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc1.4xlarge' in ids)
+ self.assertTrue('cc2.8xlarge' in ids)
else:
self.assertEqual(len(sizes), 9)