Author: tomaz
Date: Thu Dec 15 07:22:48 2011
New Revision: 1214643
URL: http://svn.apache.org/viewvc?rev=1214643&view=rev
Log:
Add support for Amazon EC2 new location - South America (Sao Paulo).
Modified:
libcloud/trunk/CHANGES
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/compute/providers.py
libcloud/trunk/libcloud/compute/types.py
libcloud/trunk/libcloud/data/pricing.json
Modified: libcloud/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1214643&r1=1214642&r2=1214643&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Thu Dec 15 07:22:48 2011
@@ -12,6 +12,9 @@ Changes with Apache Libcloud in developm
- Add implementation for ex_save_image method to the OpenStack 1.1 driver.
[Shawn Smith]
+ - Add support for Amazon new South America (Sao Paulo) location.
+ [Tomaz Muraus]
+
*) Storage:
- Propagate extra keyword arguments passed to the Rackspace driver
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1214643&r1=1214642&r2=1214643&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Thu Dec 15 07:22:48 2011
@@ -47,6 +47,7 @@ EC2_US_WEST_OREGON_HOST = 'ec2.us-west-2
EC2_EU_WEST_HOST = 'ec2.eu-west-1.amazonaws.com'
EC2_AP_SOUTHEAST_HOST = 'ec2.ap-southeast-1.amazonaws.com'
EC2_AP_NORTHEAST_HOST = 'ec2.ap-northeast-1.amazonaws.com'
+EC2_SA_EAST_HOST = 'ec2.sa-east-1.amazonaws.com'
API_VERSION = '2010-08-31'
@@ -151,6 +152,7 @@ EC2_EU_WEST_INSTANCE_TYPES = dict(EC2_IN
EC2_AP_SOUTHEAST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
EC2_AP_NORTHEAST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
EC2_US_WEST_OREGON_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
+EC2_SA_EAST_INSTANCE_TYPES = dict(EC2_INSTANCE_TYPES)
class EC2NodeLocation(NodeLocation):
@@ -1167,6 +1169,28 @@ class EC2APNENodeDriver(EC2NodeDriver):
_instance_types = EC2_AP_NORTHEAST_INSTANCE_TYPES
+class EC2SAEastConnection(EC2Connection):
+ """
+ Connection class for EC2 in the South America (Sao Paulo) Region
+ """
+
+ host = EC2_SA_EAST_HOST
+
+
+class EC2SAEastNodeDriver(EC2NodeDriver):
+ """
+ Driver class for EC2 in the South America (Sao Paulo) Region
+ """
+
+ api_name = 'ec2_sa_east'
+ name = 'Amazon EC2 (sa-east-1)'
+ friendly_name = 'Amazon South America Sao Paulo'
+ country = 'BR'
+ region_name = 'sa-east-1'
+ connectionCls = EC2SAEastConnection
+ _instance_types = EC2_SA_EAST_INSTANCE_TYPES
+
+
class EucConnection(EC2Connection):
"""
Connection class for Eucalyptus
Modified: libcloud/trunk/libcloud/compute/providers.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/providers.py?rev=1214643&r1=1214642&r2=1214643&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/providers.py (original)
+++ libcloud/trunk/libcloud/compute/providers.py Thu Dec 15 07:22:48 2011
@@ -39,6 +39,8 @@ DRIVERS = {
('libcloud.compute.drivers.ec2', 'EC2APSENodeDriver'),
Provider.EC2_AP_NORTHEAST:
('libcloud.compute.drivers.ec2', 'EC2APNENodeDriver'),
+ Provider.EC2_SA_EAST:
+ ('libcloud.compute.drivers.ec2', 'EC2SAEastNodeDriver'),
Provider.ECP:
('libcloud.compute.drivers.ecp', 'ECPNodeDriver'),
Provider.ELASTICHOSTS_UK1:
Modified: libcloud/trunk/libcloud/compute/types.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/types.py?rev=1214643&r1=1214642&r2=1214643&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/types.py (original)
+++ libcloud/trunk/libcloud/compute/types.py Thu Dec 15 07:22:48 2011
@@ -101,6 +101,7 @@ class Provider(object):
EC2_US_WEST_OREGON = 36
CLOUDSTACK = 37
CLOUDSIGMA_US = 38
+ EC2_SA_EAST = 39
class NodeState(object):
"""
Modified: libcloud/trunk/libcloud/data/pricing.json
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1214643&r1=1214642&r2=1214643&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Thu Dec 15 07:22:48 2011
@@ -98,6 +98,18 @@
"m2.xlarge": 0.60,
"m2.2xlarge": 1.20,
"m2.4xlarge": 2.39
+ },
+
+ "ec2_sa_east": {
+ "t1.micro": 0.027,
+ "m1.small": 0.115,
+ "m1.large": 0.46,
+ "m1.xlarge": 0.92,
+ "c1.medium": 0.23,
+ "c1.xlarge": 0.92,
+ "m2.xlarge": 0.68,
+ "m2.2xlarge": 1.36,
+ "m2.4xlarge": 2.72
},
"nimbus" : {
