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:33:08 UTC
svn commit: r902284 - in /incubator/libcloud/trunk/libcloud: providers.py
types.py
Author: pquerna
Date: Fri Jan 22 21:33:07 2010
New Revision: 902284
URL: http://svn.apache.org/viewvc?rev=902284&view=rev
Log:
Fully add ec2 us west, and switch over other ec2 locations to use better names, deprecating the old names
Modified:
incubator/libcloud/trunk/libcloud/providers.py
incubator/libcloud/trunk/libcloud/types.py
Modified: incubator/libcloud/trunk/libcloud/providers.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/providers.py?rev=902284&r1=902283&r2=902284&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/providers.py (original)
+++ incubator/libcloud/trunk/libcloud/providers.py Fri Jan 22 21:33:07 2010
@@ -25,10 +25,12 @@
DRIVERS = {
# Provider.DUMMY:
# ('libcloud.drivers.dummy', 'DummyNodeDriver'),
- Provider.EC2:
+ Provider.EC2_US_EAST:
('libcloud.drivers.ec2', 'EC2NodeDriver'),
- Provider.EC2_EU:
+ Provider.EC2_EU_WEST:
('libcloud.drivers.ec2', 'EC2EUNodeDriver'),
+ Provider.EC2_US_WEST:
+ ('libcloud.drivers.ec2', 'EC2USWestNodeDriver'),
Provider.GOGRID:
('libcloud.drivers.gogrid', 'GoGridNodeDriver'),
Provider.RACKSPACE:
Modified: incubator/libcloud/trunk/libcloud/types.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/types.py?rev=902284&r1=902283&r2=902284&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/types.py (original)
+++ incubator/libcloud/trunk/libcloud/types.py Fri Jan 22 21:33:07 2010
@@ -21,8 +21,9 @@
Defines for each of the supported providers
@cvar DUMMY: Example provider
- @cvar EC2: Amazon AWS
- @cvar EC2_EU: Amazon AWS EU
+ @cvar EC2_US_EAST: Amazon AWS US N. Virgina
+ @cvar EC2_US_WEST: Amazon AWS US N. California
+ @cvar EC2_EU_WEST: Amazon AWS EU Ireland
@cvar RACKSPACE: Rackspace Cloud Servers
@cvar SLICEHOST: Slicehost.com
@cvar GOGRID: GoGrid
@@ -32,8 +33,10 @@
@cvar RIMUHOSTING: RimuHosting.com
"""
DUMMY = 0
- EC2 = 1
- EC2_EU = 2
+ EC2 = 1 # deprecated name
+ EC2_US_EAST = 1
+ EC2_EU = 2 # deprecated name
+ EC2_EU_WEST = 2
RACKSPACE = 3
SLICEHOST = 4
GOGRID = 5
@@ -41,6 +44,7 @@
LINODE = 7
VCLOUD = 8
RIMUHOSTING = 9
+ EC2_US_WEST = 10
class NodeState(object):
"""