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 2012/07/02 04:12:01 UTC
svn commit: r1356058 - in /libcloud/trunk: CHANGES
libcloud/compute/drivers/ec2.py libcloud/data/pricing.json
libcloud/test/compute/test_ec2.py
Author: tomaz
Date: Mon Jul 2 02:12:00 2012
New Revision: 1356058
URL: http://svn.apache.org/viewvc?rev=1356058&view=rev
Log:
Modify EC2 driver to also return cc2.8xlarge cluster compute instance in
the eu-west-1 region.
Modified:
libcloud/trunk/CHANGES
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/data/pricing.json
libcloud/trunk/libcloud/test/compute/test_ec2.py
Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1356058&r1=1356057&r2=1356058&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Mon Jul 2 02:12:00 2012
@@ -66,6 +66,10 @@ Changes with Apache Libcloud in developm
; LIBCLOUD-219
[Bruno Mahé, Tomaz Muraus]
+ - Modify EC2 driver to also return cc2.8xlarge cluster compute instance in
+ the eu-west-1 region.
+ [Tomaz Muraus]
+
*) DNS
- Add support for GEO RecordType to Zerigo driver. ; LIBCLOUD-203
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1356058&r1=1356057&r2=1356058&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Mon Jul 2 02:12:00 2012
@@ -500,17 +500,22 @@ class EC2NodeDriver(NodeDriver):
return nodes
def list_sizes(self, location=None):
- # Cluster instances are currently only available
- # in the US - N. Virginia Region
- include_ci = self.region_name == 'us-east-1'
- sizes = self._get_sizes(include_cluser_instances=include_ci)
+ # Cluster instances are not available in all the regions
+ if self.region_name == 'us-east-1':
+ ignored_size_ids = None
+ elif self.region_name == 'eu-west-1':
+ ignored_size_ids = CLUSTER_INSTANCES_IDS[:-1]
+ else:
+ ignored_size_ids = CLUSTER_INSTANCES_IDS
+
+ sizes = self._get_sizes(ignored_size_ids=ignored_size_ids)
return sizes
- def _get_sizes(self, include_cluser_instances=False):
+ def _get_sizes(self, ignored_size_ids=None):
+ ignored_size_ids = ignored_size_ids or []
sizes = []
for key, values in self._instance_types.items():
- if not include_cluser_instances and\
- key in CLUSTER_INSTANCES_IDS:
+ if key in ignored_size_ids:
continue
attributes = copy.deepcopy(values)
attributes.update({'price': self._get_size_price(size_id=key)})
Modified: libcloud/trunk/libcloud/data/pricing.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1356058&r1=1356057&r2=1356058&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Mon Jul 2 02:12:00 2012
@@ -78,7 +78,8 @@
"c1.xlarge": 0.76,
"m2.xlarge": 0.57,
"m2.2xlarge": 1.14,
- "m2.4xlarge": 2.28
+ "m2.4xlarge": 2.28,
+ "cc2.8xlarge": 2.7
},
"ec2_ap_southeast": {
Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1356058&r1=1356057&r2=1356058&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Mon Jul 2 02:12:00 2012
@@ -189,6 +189,8 @@ class EC2Tests(LibcloudTestCase, TestCas
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
+ elif region_name == 'eu-west-1':
+ self.assertEqual(len(sizes), 11)
else:
self.assertEqual(len(sizes), 10)