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/08/13 02:34:57 UTC
svn commit: r985053 - in /incubator/libcloud/trunk: libcloud/
libcloud/drivers/ test/
Author: pquerna
Date: Fri Aug 13 00:34:56 2010
New Revision: 985053
URL: http://svn.apache.org/viewvc?rev=985053&view=rev
Log:
Try to be more consistent with Python Exception styles, renaming the following:
libCloudException -> LibcloudError
InvalidCredsException -> InvalidCredsError
MalformedResponseException -> MalformedResponseError
DeploymentException -> DeploymentError
For the two that were in the 0.3.x API (InvalidCredsException, DeploymentException), I've left in deprecated copies.
Modified:
incubator/libcloud/trunk/libcloud/base.py
incubator/libcloud/trunk/libcloud/drivers/dreamhost.py
incubator/libcloud/trunk/libcloud/drivers/ec2.py
incubator/libcloud/trunk/libcloud/drivers/ecp.py
incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
incubator/libcloud/trunk/libcloud/drivers/gogrid.py
incubator/libcloud/trunk/libcloud/drivers/ibm_sbc.py
incubator/libcloud/trunk/libcloud/drivers/linode.py
incubator/libcloud/trunk/libcloud/drivers/opennebula.py
incubator/libcloud/trunk/libcloud/drivers/rackspace.py
incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py
incubator/libcloud/trunk/libcloud/drivers/slicehost.py
incubator/libcloud/trunk/libcloud/drivers/softlayer.py
incubator/libcloud/trunk/libcloud/drivers/vcloud.py
incubator/libcloud/trunk/libcloud/drivers/voxel.py
incubator/libcloud/trunk/libcloud/drivers/vpsnet.py
incubator/libcloud/trunk/libcloud/types.py
incubator/libcloud/trunk/test/test_dreamhost.py
incubator/libcloud/trunk/test/test_gogrid.py
incubator/libcloud/trunk/test/test_ibm_sbc.py
incubator/libcloud/trunk/test/test_rackspace.py
incubator/libcloud/trunk/test/test_slicehost.py
incubator/libcloud/trunk/test/test_voxel.py
Modified: incubator/libcloud/trunk/libcloud/base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/base.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/base.py (original)
+++ incubator/libcloud/trunk/libcloud/base.py Fri Aug 13 00:34:56 2010
@@ -18,7 +18,7 @@ Provides base classes for working with d
"""
import httplib, urllib
import libcloud
-from libcloud.types import NodeState, DeploymentException
+from libcloud.types import NodeState, DeploymentError
from libcloud.ssh import SSHClient
import time
import hashlib
@@ -658,9 +658,9 @@ class NodeDriver(object):
nodes = self.list_nodes()
nodes = filter(lambda n: n.uuid == node.uuid, nodes)
if len(nodes) == 0:
- raise DeploymentException(node, "Booted node[%s] is missing form list_nodes." % node)
+ raise DeploymentError(node, "Booted node[%s] is missing form list_nodes." % node)
if len(nodes) > 1:
- raise DeploymentException(node, "Booted single node[%s], but multiple nodes have same UUID"% node)
+ raise DeploymentError(node, "Booted single node[%s], but multiple nodes have same UUID"% node)
node = nodes[0]
@@ -684,10 +684,10 @@ class NodeDriver(object):
n = kwargs["deploy"].run(node, client)
client.close()
- except DeploymentException, e:
+ except DeploymentError, e:
raise
except Exception, e:
- raise DeploymentException(node, e)
+ raise DeploymentError(node, e)
return n
def is_private_subnet(ip):
Modified: incubator/libcloud/trunk/libcloud/drivers/dreamhost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/dreamhost.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/dreamhost.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/dreamhost.py Fri Aug 13 00:34:56 2010
@@ -18,7 +18,7 @@ DreamHost Driver
from libcloud.base import ConnectionKey, Response, NodeDriver, Node
from libcloud.base import NodeSize, NodeImage
-from libcloud.types import Provider, NodeState, InvalidCredsException
+from libcloud.types import Provider, NodeState, InvalidCredsError
# JSON is included in the standard library starting with Python 2.6. For 2.5
# and 2.4, there's a simplejson egg at: http://pypi.python.org/pypi/simplejson
@@ -102,7 +102,7 @@ class DreamhostResponse(Response):
def _api_parse_error(self, response):
if 'data' in response:
if response['data'] == 'invalid_api_key':
- raise InvalidCredsException("Oops! You've entered an invalid API key")
+ raise InvalidCredsError("Oops! You've entered an invalid API key")
else:
raise DreamhostAPIException(response['data'])
else:
Modified: incubator/libcloud/trunk/libcloud/drivers/ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ec2.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ec2.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ec2.py Fri Aug 13 00:34:56 2010
@@ -17,7 +17,7 @@
Amazon EC2 driver
"""
from libcloud.providers import Provider
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Node, Response, ConnectionUserAndKey
from libcloud.base import NodeDriver, NodeSize, NodeImage, NodeLocation
import base64
@@ -153,19 +153,19 @@ class EC2Response(Response):
# if you are using the wrong user/password.
msg = "Failure: 403 Forbidden"
if self.status == 403 and self.body[:len(msg)] == msg:
- raise InvalidCredsException(msg)
+ raise InvalidCredsError(msg)
for err in ET.XML(self.body).findall('Errors/Error'):
code, message = err.getchildren()
err_list.append("%s: %s" % (code.text, message.text))
if code.text == "InvalidClientTokenId":
- raise InvalidCredsException(err_list[-1])
+ raise InvalidCredsError(err_list[-1])
if code.text == "SignatureDoesNotMatch":
- raise InvalidCredsException(err_list[-1])
+ raise InvalidCredsError(err_list[-1])
if code.text == "AuthFailure":
- raise InvalidCredsException(err_list[-1])
+ raise InvalidCredsError(err_list[-1])
if code.text == "OptInRequired":
- raise InvalidCredsException(err_list[-1])
+ raise InvalidCredsError(err_list[-1])
return "\n".join(err_list)
class EC2Connection(ConnectionUserAndKey):
Modified: incubator/libcloud/trunk/libcloud/drivers/ecp.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ecp.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ecp.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ecp.py Fri Aug 13 00:34:56 2010
@@ -19,7 +19,7 @@ Enomaly ECP driver
from libcloud.base import NodeDriver, NodeSize, NodeLocation
from libcloud.base import NodeImage, Node
from libcloud.base import Response, ConnectionUserAndKey
-from libcloud.types import Provider, NodeState, InvalidCredsException
+from libcloud.types import Provider, NodeState, InvalidCredsError
from libcloud.base import is_private_subnet
import time
@@ -52,7 +52,7 @@ class ECPResponse(Response):
self.error = "ECP error: %s" % j_body['message']
return False
elif self.status == httplib.UNAUTHORIZED:
- raise InvalidCredsException()
+ raise InvalidCredsError()
else:
self.error = "HTTP Error Code: %s" % self.status
return False
Modified: incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/elastichosts.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/elastichosts.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/elastichosts.py Fri Aug 13 00:34:56 2010
@@ -20,7 +20,7 @@ import re
import time
import base64
-from libcloud.types import Provider, NodeState, InvalidCredsException
+from libcloud.types import Provider, NodeState, InvalidCredsError
from libcloud.base import ConnectionUserAndKey, Response
from libcloud.base import NodeDriver, NodeSize, Node
from libcloud.base import NodeImage
@@ -175,7 +175,7 @@ class ElasticHostsException(Exception):
class ElasticHostsResponse(Response):
def success(self):
if self.status == 401:
- raise InvalidCredsException()
+ raise InvalidCredsError()
return self.status >= 200 and self.status <= 299
Modified: incubator/libcloud/trunk/libcloud/drivers/gogrid.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/gogrid.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/gogrid.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/gogrid.py Fri Aug 13 00:34:56 2010
@@ -16,8 +16,8 @@
GoGrid driver
"""
from libcloud.providers import Provider
-from libcloud.types import NodeState, MalformedResponseException,\
- InvalidCredsException, LibCloudException
+from libcloud.types import NodeState, MalformedResponseError,\
+ InvalidCredsError, LibcloudError
from libcloud.base import Node, ConnectionUserAndKey, Response, NodeDriver
from libcloud.base import NodeSize, NodeImage, NodeLocation
import time
@@ -76,13 +76,13 @@ GOGRID_INSTANCE_TYPES = {'512MB': {'id':
class GoGridResponse(Response):
def success(self):
if self.status == 403:
- raise InvalidCredsException('Invalid credentials', GoGridNodeDriver)
+ raise InvalidCredsError('Invalid credentials', GoGridNodeDriver)
if not self.body:
return None
try:
return json.loads(self.body)['status'] == 'success'
except ValueError:
- raise MalformedResponseException('Malformed reply', GoGridNodeDriver)
+ raise MalformedResponseError('Malformed reply', body=self.body, driver=GoGridNodeDriver)
def parse_body(self):
if not self.body:
@@ -234,7 +234,7 @@ class GoGridNodeDriver(NodeDriver):
if object['list']:
return object['list'][0]['ip']
else:
- raise LibCloudException('No public unassigned IPs left',
+ raise LibcloudError('No public unassigned IPs left',
GoGridNodeDriver)
def list_sizes(self, location=None):
Modified: incubator/libcloud/trunk/libcloud/drivers/ibm_sbc.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ibm_sbc.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ibm_sbc.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ibm_sbc.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@
"""
Driver for the IBM Developer Cloud.
"""
-from libcloud.types import NodeState, InvalidCredsException, Provider
+from libcloud.types import NodeState, InvalidCredsError, Provider
from libcloud.base import Response, ConnectionUserAndKey, NodeDriver, Node, NodeImage, NodeSize, NodeLocation, NodeAuthSSHKey
import base64, urllib
@@ -37,9 +37,9 @@ class IBMResponse(Response):
def parse_error(self):
if int(self.status) == 401:
if not self.body:
- raise InvalidCredsException(str(self.status) + ': ' + self.error)
+ raise InvalidCredsError(str(self.status) + ': ' + self.error)
else:
- raise InvalidCredsException(self.body)
+ raise InvalidCredsError(self.body)
return self.body
class IBMConnection(ConnectionUserAndKey):
Modified: incubator/libcloud/trunk/libcloud/drivers/linode.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/linode.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/linode.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/linode.py Fri Aug 13 00:34:56 2010
@@ -27,7 +27,7 @@ Linode(R) is a registered trademark of L
Maintainer: Jed Smith <je...@linode.com>"""
-from libcloud.types import Provider, NodeState, InvalidCredsException, MalformedResponseException
+from libcloud.types import Provider, NodeState, InvalidCredsError, MalformedResponseError
from libcloud.base import ConnectionKey, Response
from libcloud.base import NodeDriver, NodeSize, Node, NodeLocation
from libcloud.base import NodeAuthPassword, NodeAuthSSHKey
@@ -114,7 +114,7 @@ class LinodeResponse(Response):
try:
js = json.loads(self.body)
except:
- raise MalformedResponseException("Failed to parse JSON", body=self.body, driver=LinodeNodeDriver)
+ raise MalformedResponseError("Failed to parse JSON", body=self.body, driver=LinodeNodeDriver)
try:
if ("DATA" not in js
@@ -134,7 +134,7 @@ class LinodeResponse(Response):
try:
js = json.loads(self.body)
except:
- raise MalformedResponseException("Failed to parse JSON", body=self.body, driver=LinodeNodeDriver)
+ raise MalformedResponseError("Failed to parse JSON", body=self.body, driver=LinodeNodeDriver)
try:
if "ERRORARRAY" not in js:
@@ -160,7 +160,7 @@ class LinodeResponse(Response):
if "ERRORCODE" not in error or "ERRORMESSAGE" not in error:
return None
if error["ERRORCODE"] == 4:
- return InvalidCredsException(error["ERRORMESSAGE"])
+ return InvalidCredsError(error["ERRORMESSAGE"])
return LinodeException(error["ERRORCODE"], error["ERRORMESSAGE"])
Modified: incubator/libcloud/trunk/libcloud/drivers/opennebula.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/opennebula.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/opennebula.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/opennebula.py Fri Aug 13 00:34:56 2010
@@ -24,7 +24,7 @@ import hashlib
from xml.etree import ElementTree as ET
from libcloud.providers import Provider
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Response, ConnectionUserAndKey
from libcloud.base import NodeDriver, Node, NodeLocation
from libcloud.base import NodeImage, NodeSize
@@ -48,7 +48,7 @@ class OpenNebulaResponse(Response):
def parse_error(self):
if int(self.status) == 401:
- raise InvalidCredsException(self.body)
+ raise InvalidCredsError(self.body)
return self.body
Modified: incubator/libcloud/trunk/libcloud/drivers/rackspace.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/rackspace.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/rackspace.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/rackspace.py Fri Aug 13 00:34:56 2010
@@ -15,7 +15,8 @@
"""
Rackspace driver
"""
-from libcloud.types import NodeState, InvalidCredsException, Provider, MalformedResponseException
+from libcloud.types import NodeState, InvalidCredsError, \
+ Provider, MalformedResponseError
from libcloud.base import ConnectionUserAndKey, Response, NodeDriver, Node
from libcloud.base import NodeSize, NodeImage, NodeLocation
import os
@@ -55,14 +56,14 @@ class RackspaceResponse(Response):
try:
body = ET.XML(self.body)
except:
- raise MalformedResponseException("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
return body
def parse_error(self):
# TODO: fixup, Rackspace only uses response codes really!
try:
body = ET.XML(self.body)
except:
- raise MalformedResponseException("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
try:
text = "; ".join([ err.text or ''
for err in
@@ -119,14 +120,14 @@ class RackspaceConnection(ConnectionUser
self.token = headers['x-auth-token']
endpoint = headers['x-server-management-url']
except KeyError:
- raise InvalidCredsException()
+ raise InvalidCredsError()
scheme, server, self.path, param, query, fragment = (
urlparse.urlparse(endpoint)
)
if scheme is "https" and self.secure is not 1:
# TODO: Custom exception (?)
- raise InvalidCredsException()
+ raise InvalidCredsError()
# Set host to where we want to make further requests to;
# close auth conn
Modified: incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@
"""
RimuHosting Driver
"""
-from libcloud.types import Provider, NodeState, InvalidCredsException
+from libcloud.types import Provider, NodeState, InvalidCredsError
from libcloud.base import ConnectionKey, Response, NodeAuthPassword
from libcloud.base import NodeDriver, NodeSize, Node, NodeLocation
from libcloud.base import NodeImage
@@ -55,7 +55,7 @@ class RimuHostingResponse(Response):
def success(self):
if self.status == 403:
- raise InvalidCredsException()
+ raise InvalidCredsError()
return True
def parse_body(self):
try:
Modified: incubator/libcloud/trunk/libcloud/drivers/slicehost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/slicehost.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/slicehost.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/slicehost.py Fri Aug 13 00:34:56 2010
@@ -15,7 +15,7 @@
"""
Slicehost Driver
"""
-from libcloud.types import NodeState, Provider, InvalidCredsException
+from libcloud.types import NodeState, Provider, InvalidCredsError
from libcloud.base import ConnectionKey, Response, NodeDriver, Node
from libcloud.base import NodeSize, NodeImage, NodeLocation
from libcloud.base import is_private_subnet
@@ -35,7 +35,7 @@ class SlicehostResponse(Response):
def parse_error(self):
if self.status == 401:
- raise InvalidCredsException(self.body)
+ raise InvalidCredsError(self.body)
try:
object = ET.XML(self.body)
Modified: incubator/libcloud/trunk/libcloud/drivers/softlayer.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/softlayer.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/softlayer.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/softlayer.py Fri Aug 13 00:34:56 2010
@@ -20,7 +20,7 @@ import time
import xmlrpclib
import libcloud
-from libcloud.types import Provider, InvalidCredsException, NodeState
+from libcloud.types import Provider, InvalidCredsError, NodeState, LibcloudError
from libcloud.base import NodeDriver, Node, NodeLocation, NodeSize, NodeImage
DATACENTERS = {
@@ -132,7 +132,7 @@ SL_TEMPLATES = {
}
}
-class SoftLayerException(Exception):
+class SoftLayerException(LibcloudError):
"""
Exception class for SoftLayer driver
"""
Modified: incubator/libcloud/trunk/libcloud/drivers/vcloud.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/vcloud.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/vcloud.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/vcloud.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@
VMware vCloud driver.
"""
from libcloud.providers import Provider
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Node, Response, ConnectionUserAndKey, NodeDriver
from libcloud.base import NodeSize, NodeImage, NodeAuthPassword, NodeLocation
@@ -252,7 +252,7 @@ class VCloudConnection(ConnectionUserAnd
try:
self.token = headers['set-cookie']
except KeyError:
- raise InvalidCredsException()
+ raise InvalidCredsError()
self.driver.org = get_url_path(
body.find(fixxpath(body, 'Org')).get('href')
Modified: incubator/libcloud/trunk/libcloud/drivers/voxel.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/voxel.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/voxel.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/voxel.py Fri Aug 13 00:34:56 2010
@@ -17,7 +17,7 @@
Voxel VoxCloud driver
"""
from libcloud.providers import Provider
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Node, Response, ConnectionUserAndKey, NodeDriver
from libcloud.base import NodeSize, NodeImage, NodeLocation
import datetime
@@ -54,7 +54,7 @@ class VoxelResponse(Response):
if code == "1" or code == "9":
# sucks, but only way to detect
# bad authentication tokens so far
- raise InvalidCredsException(err_list[-1])
+ raise InvalidCredsError(err_list[-1])
return "\n".join(err_list)
def success(self):
Modified: incubator/libcloud/trunk/libcloud/drivers/vpsnet.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/vpsnet.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/vpsnet.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/vpsnet.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@
VPS.net driver
"""
from libcloud.providers import Provider
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Node, Response, ConnectionUserAndKey, NodeDriver
from libcloud.base import NodeSize, NodeImage, NodeLocation
@@ -57,7 +57,7 @@ class VPSNetResponse(Response):
def success(self):
# vps.net wrongly uses 406 for invalid auth creds
if self.status == 406 or self.status == 403:
- raise InvalidCredsException()
+ raise InvalidCredsError()
return True
def parse_error(self):
Modified: incubator/libcloud/trunk/libcloud/types.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/types.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/types.py (original)
+++ incubator/libcloud/trunk/libcloud/types.py Fri Aug 13 00:34:56 2010
@@ -77,13 +77,13 @@ class NodeState(object):
PENDING = 3
UNKNOWN = 4
-class LibCloudException(Exception):
+class LibcloudError(Exception):
"""The base class for other libcloud exceptions"""
def __init__(self, value, driver=None):
self.value = value
self.driver = driver
-class MalformedResponseException(LibCloudException):
+class MalformedResponseError(LibcloudError):
"""Exception for the cases when a provider returns a malformed
response, e.g. you request JSON and provider returns
'<h3>something</h3>' due to some error on their side."""
@@ -94,15 +94,17 @@ class MalformedResponseException(LibClou
def __str__(self):
return "<MalformedResponseException in "+ driver +" "+ repr(self.value) +">: "+ repr(self.body)
-class InvalidCredsException(LibCloudException):
+class InvalidCredsError(LibcloudError):
"""Exception used when invalid credentials are used on a provider."""
def __init__(self, value='Invalid credentials with the provider', driver=None):
self.value = value
self.driver = driver
def __str__(self):
return repr(self.value)
+"""Deprecated alias of L{InvalidCredsError}"""
+InvalidCredsException = InvalidCredsError
-class DeploymentException(LibCloudException):
+class DeploymentError(LibcloudError):
"""
Exception used when a Deployment Task failed.
@@ -113,3 +115,6 @@ class DeploymentException(LibCloudExcept
self.value = original_exception
def __str__(self):
return repr(self.value)
+
+"""Deprecated alias of L{DeploymentException}"""
+DeploymentException = DeploymentError
Modified: incubator/libcloud/trunk/test/test_dreamhost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_dreamhost.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_dreamhost.py (original)
+++ incubator/libcloud/trunk/test/test_dreamhost.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@ import sys
import unittest
from libcloud.drivers.dreamhost import DreamhostNodeDriver
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
import httplib
@@ -46,7 +46,7 @@ class DreamhostTest(unittest.TestCase, T
try:
self.driver.list_nodes()
self.assertTrue(False) # Above command should have thrown an InvalidCredsException
- except InvalidCredsException:
+ except InvalidCredsError:
self.assertTrue(True)
Modified: incubator/libcloud/trunk/test/test_gogrid.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_gogrid.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_gogrid.py (original)
+++ incubator/libcloud/trunk/test/test_gogrid.py Fri Aug 13 00:34:56 2010
@@ -20,7 +20,7 @@ try:
except ImportError:
import simplejson as json
-from libcloud.types import LibCloudException, InvalidCredsException
+from libcloud.types import LibcloudError, InvalidCredsError
from libcloud.drivers.gogrid import GoGridNodeDriver
from libcloud.base import Node, NodeImage, NodeSize
@@ -72,8 +72,8 @@ class GoGridTests(unittest.TestCase, Tes
GoGridMockHttp.type = 'FAIL'
try:
images = self.driver.list_images()
- except LibCloudException, e:
- self.assertTrue(isinstance(e, LibCloudException))
+ except LibcloudError, e:
+ self.assertTrue(isinstance(e, LibcloudError))
else:
self.fail("test should have thrown")
@@ -81,7 +81,7 @@ class GoGridTests(unittest.TestCase, Tes
GoGridMockHttp.type = 'FAIL'
try:
nodes = self.driver.list_nodes()
- except InvalidCredsException, e:
+ except InvalidCredsError, e:
self.assertTrue(e.driver is not None)
self.assertEqual(e.driver.name, self.driver.name)
else:
@@ -94,8 +94,8 @@ class GoGridTests(unittest.TestCase, Tes
size = NodeSize('512Mb', None, None, None, None, None, driver=self.driver)
node = self.driver.create_node(name='test1', image=image, size=size)
- except LibCloudException, e:
- self.assertTrue(isinstance(e, LibCloudException))
+ except LibcloudError, e:
+ self.assertTrue(isinstance(e, LibcloudError))
self.assertTrue(e.driver is not None)
self.assertEqual(e.driver.name, self.driver.name)
else:
Modified: incubator/libcloud/trunk/test/test_ibm_sbc.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_ibm_sbc.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_ibm_sbc.py (original)
+++ incubator/libcloud/trunk/test/test_ibm_sbc.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@ import httplib
import sys
from test.file_fixtures import FileFixtures
-from libcloud.types import InvalidCredsException
+from libcloud.types import InvalidCredsError
from libcloud.drivers.ibm_sbc import IBMNodeDriver as IBM
from libcloud.base import Node, NodeImage, NodeSize, NodeLocation
from test import MockHttp, TestCaseMixin
@@ -37,8 +37,8 @@ class IBMTests(unittest.TestCase, TestCa
try:
self.driver.list_nodes()
- except InvalidCredsException, e:
- self.assertTrue(isinstance(e, InvalidCredsException))
+ except InvalidCredsError, e:
+ self.assertTrue(isinstance(e, InvalidCredsError))
self.assertEquals(e.value, '401: Unauthorized')
else:
self.fail('test should have thrown')
Modified: incubator/libcloud/trunk/test/test_rackspace.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_rackspace.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_rackspace.py (original)
+++ incubator/libcloud/trunk/test/test_rackspace.py Fri Aug 13 00:34:56 2010
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.types import InvalidCredsException
+from libcloud.types import InvalidCredsError
from libcloud.drivers.rackspace import RackspaceNodeDriver as Rackspace
from libcloud.base import Node, NodeImage, NodeSize
@@ -36,8 +36,8 @@ class RackspaceTests(unittest.TestCase,
RackspaceMockHttp.type = 'UNAUTHORIZED'
try:
self.driver = Rackspace(RACKSPACE_USER, RACKSPACE_KEY)
- except InvalidCredsException, e:
- self.assertEqual(True, isinstance(e, InvalidCredsException))
+ except InvalidCredsError, e:
+ self.assertEqual(True, isinstance(e, InvalidCredsError))
else:
self.fail('test should have thrown')
Modified: incubator/libcloud/trunk/test/test_slicehost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_slicehost.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_slicehost.py (original)
+++ incubator/libcloud/trunk/test/test_slicehost.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@ import sys
import unittest
from libcloud.drivers.slicehost import SlicehostNodeDriver as Slicehost
-from libcloud.types import NodeState, InvalidCredsException
+from libcloud.types import NodeState, InvalidCredsError
from libcloud.base import Node, NodeImage, NodeSize
import httplib
@@ -45,7 +45,7 @@ class SlicehostTest(unittest.TestCase, T
SlicehostMockHttp.type = 'UNAUTHORIZED'
try:
ret = self.driver.list_nodes()
- except InvalidCredsException, e:
+ except InvalidCredsError, e:
self.assertEqual(e.value, 'HTTP Basic: Access denied.')
else:
self.fail('test should have thrown')
Modified: incubator/libcloud/trunk/test/test_voxel.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_voxel.py?rev=985053&r1=985052&r2=985053&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_voxel.py (original)
+++ incubator/libcloud/trunk/test/test_voxel.py Fri Aug 13 00:34:56 2010
@@ -16,7 +16,7 @@ import sys
import unittest
from libcloud.drivers.voxel import VoxelNodeDriver as Voxel
-from libcloud.types import InvalidCredsException
+from libcloud.types import InvalidCredsError
import httplib
@@ -38,7 +38,7 @@ class VoxelTest(unittest.TestCase):
try:
self.driver.list_nodes()
except Exception, e:
- self.assertTrue(isinstance(e, InvalidCredsException))
+ self.assertTrue(isinstance(e, InvalidCredsError))
else:
self.fail('test should have thrown')