You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by pq...@apache.org on 2010/01/22 22:22:38 UTC
svn commit: r902275 - /incubator/libcloud/trunk/libcloud/drivers/ec2.py
Author: pquerna
Date: Fri Jan 22 21:22:38 2010
New Revision: 902275
URL: http://svn.apache.org/viewvc?rev=902275&view=rev
Log:
rename ec2 eu -> ec2 eu west
Modified:
incubator/libcloud/trunk/libcloud/drivers/ec2.py
Modified: incubator/libcloud/trunk/libcloud/drivers/ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ec2.py?rev=902275&r1=902274&r2=902275&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ec2.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ec2.py Fri Jan 22 21:22:38 2010
@@ -29,7 +29,7 @@
from xml.etree import ElementTree as ET
EC2_US_EAST_HOST = 'ec2.amazonaws.com'
-EC2_EU_HOST = 'eu-west-1.ec2.amazonaws.com'
+EC2_EU_WEST_HOST = 'eu-west-1.ec2.amazonaws.com'
API_VERSION = '2009-04-04'
NAMESPACE = "http://ec2.amazonaws.com/doc/%s/" % (API_VERSION)
@@ -74,7 +74,7 @@
EC2_US_EAST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
-EC2_EU_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
+EC2_EU_WEST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
EC2_US_EAST_INSTANCE_TYPES['m1.small']['price'] = '.1'
EC2_US_EAST_INSTANCE_TYPES['m1.large']['price'] = '.4'
@@ -84,13 +84,13 @@
EC2_US_EAST_INSTANCE_TYPES['m2.2xlarge']['price'] = '1.2'
EC2_US_EAST_INSTANCE_TYPES['m2.4xlarge']['price'] = '2.4'
-EC2_EU_INSTANCE_TYPES['m1.small']['price'] = '.11'
-EC2_EU_INSTANCE_TYPES['m1.large']['price'] = '.44'
-EC2_EU_INSTANCE_TYPES['m1.xlarge']['price'] = '.88'
-EC2_EU_INSTANCE_TYPES['c1.medium']['price'] = '.22'
-EC2_EU_INSTANCE_TYPES['c1.xlarge']['price'] = '.88'
-EC2_EU_INSTANCE_TYPES['m2.2xlarge']['price'] = '1.34'
-EC2_EU_INSTANCE_TYPES['m2.4xlarge']['price'] = '2.68'
+EC2_EU_WEST_INSTANCE_TYPES['m1.small']['price'] = '.11'
+EC2_EU_WEST_INSTANCE_TYPES['m1.large']['price'] = '.44'
+EC2_EU_WEST_INSTANCE_TYPES['m1.xlarge']['price'] = '.88'
+EC2_EU_WEST_INSTANCE_TYPES['c1.medium']['price'] = '.22'
+EC2_EU_WEST_INSTANCE_TYPES['c1.xlarge']['price'] = '.88'
+EC2_EU_WEST_INSTANCE_TYPES['m2.2xlarge']['price'] = '1.34'
+EC2_EU_WEST_INSTANCE_TYPES['m2.4xlarge']['price'] = '2.68'
class EC2Response(Response):
@@ -287,11 +287,11 @@
class EC2EUConnection(EC2Connection):
- host = EC2_EU_HOST
+ host = EC2_EU_WEST_HOST
class EC2EUNodeDriver(EC2NodeDriver):
connectionCls = EC2EUConnection
- _instance_types = EC2_EU_INSTANCE_TYPES
+ _instance_types = EC2_EU_WEST_INSTANCE_TYPES
def list_locations(self):
return [NodeLocation(0, "Amazon Europe", 'IE', self)]