Author: tomaz
Date: Thu Aug 16 02:17:02 2012
New Revision: 1373698
URL: http://svn.apache.org/viewvc?rev=1373698&view=rev
Log:
Add Rackspace Nova pricing.
Modified:
libcloud/trunk/libcloud/compute/drivers/rackspacenova.py
libcloud/trunk/libcloud/data/pricing.json
Modified: libcloud/trunk/libcloud/compute/drivers/rackspacenova.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/rackspacenova.py?rev=1373698&r1=1373697&r2=1373698&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/rackspacenova.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/rackspacenova.py Thu Aug 16
02:17:02 2012
@@ -25,7 +25,6 @@ class RackspaceNovaConnection(OpenStack_
get_endpoint_args = {}
def get_endpoint(self):
-
if not self.get_endpoint_args:
raise LibcloudError(
'RackspaceNovaConnection must have get_endpoint_args set')
@@ -71,7 +70,7 @@ class RackspaceNovaDfwNodeDriver(OpenSta
website = 'http://www.rackspace.com/'
connectionCls = RackspaceNovaDfwConnection
type = Provider.RACKSPACE_NOVA_DFW
- api_name = 'rackspacenovadfw'
+ api_name = 'rackspacenovaus'
class RackspaceNovaOrdConnection(RackspaceNovaConnection):
@@ -86,7 +85,7 @@ class RackspaceNovaOrdNodeDriver(OpenSta
website = 'http://www.rackspace.com/'
connectionCls = RackspaceNovaOrdConnection
type = Provider.RACKSPACE_NOVA_ORD
- api_name = 'rackspacenovaord'
+ api_name = 'rackspacenovaus'
class RackspaceNovaLonNodeDriver(OpenStack_1_1_NodeDriver):
@@ -94,7 +93,7 @@ class RackspaceNovaLonNodeDriver(OpenSta
website = 'http://www.rackspace.com/'
connectionCls = RackspaceNovaLonConnection
type = Provider.RACKSPACE_NOVA_LON
- api_name = 'rackspacenovalon'
+ api_name = 'rackspacenovauk'
class RackspaceNovaBetaNodeDriver(OpenStack_1_1_NodeDriver):
Modified: libcloud/trunk/libcloud/data/pricing.json
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/data/pricing.json?rev=1373698&r1=1373697&r2=1373698&view=diff
==============================================================================
--- libcloud/trunk/libcloud/data/pricing.json (original)
+++ libcloud/trunk/libcloud/data/pricing.json Thu Aug 16 02:17:02 2012
@@ -18,6 +18,16 @@
"8": 1.800
},
+ "rackspacenovadfw": {
+ "2": 0.022,
+ "3": 0.060,
+ "4": 0.120,
+ "5": 0.240,
+ "6": 0.480,
+ "7": 0.960,
+ "8": 1.200
+ },
+
"dreamhost": {
"minimum": 15,
"maximum": 200,
