Handle connection errors, allow special handling

Showcase: server_info catche/manage clienterror that was
a connection error

diff --git a/kamaki/cli/commands/cyclades_cli.py b/kamaki/cli/commands/cyclades_cli.py
index 4effdda..296857f 100644 (file)
--- a/kamaki/cli/commands/cyclades_cli.py
+++ b/kamaki/cli/commands/cyclades_cli.py
@@ -37,7 +37,7 @@ from kamaki.cli.utils import print_dict, print_list, print_items, bold
 from kamaki.cli.errors import raiseCLIError, CLISyntaxError
 from kamaki.clients.cyclades import CycladesClient, ClientError
 from kamaki.cli.argument import FlagArgument, ValueArgument, KeyValueArgument
-from kamaki.cli.argument import ProgressBarArgument
+from kamaki.cli.argument import ProgressBarArgument, DateArgument
 from kamaki.cli.commands import _command_init
 
 from base64 import b64encode
@@ -59,6 +59,12 @@ about_authentication = '\n  User Authentication:\
     \n    to check authentication: /astakos authenticate\
     \n    to set authentication token: /config set token <token>'
 
+howto_token = [
+    'Make sure a valid token is provided:',
+    '  to check if the token is valid: /astakos authenticate',
+    '  to set a token: /config set [.server.]token <token>',
+    '  to get current token: /config get [server.]token']
+
 
 class _init_cyclades(_command_init):
     def main(self, service='compute'):
@@ -78,7 +84,7 @@ class server_list(_init_cyclades):
 
     arguments = dict(
         detail=FlagArgument('show detailed output', '-l'),
-        since=ValueArgument(
+        since=DateArgument(
             'show only items since date (\' d/m/Y H:M:S \')',
             '--since')
     )
@@ -123,7 +129,13 @@ class server_list(_init_cyclades):
 
 @command(server_cmds)
 class server_info(_init_cyclades):
-    """Get server details"""
+    """Detailed information on a Virtual Machine
+    Contains:
+    - name, id, status, create/update dates
+    - network interfaces
+    - metadata (e.g. os, superuser) and diagnostics
+    - hardware flavor and os image ids
+    """
 
     @classmethod
     def _print(self, server):
@@ -147,7 +159,25 @@ class server_info(_init_cyclades):
         try:
             server = self.client.get_server_details(int(server_id))
         except ValueError as err:
-            raiseCLIError(err, 'Server id must be positive integer', 1)
+            raiseCLIError(err, 'Server id must be a positive integer', 1)
+        except ClientError as ce:
+            if ce.status == 401:
+                raiseCLIError(ce, 'Authorization failed', details=howto_token)
+            elif ce.status == 404:
+                raiseCLIError(ce, 'Server with id %s not found' % server_id)
+            elif ce.status == 111:
+                raiseCLIError(err,
+                    'Connection to %s refused' % self.client.base_url,
+                    details=['Check if service is up or set compute.url',
+                    '  to get service url: /config get compute.url',
+                    '  to set service url: /config set compute.url <URL>'])
+            elif ce.status == 110:
+                raiseCLIError(err,
+                    'Connection to %s timed out' % self.client.base_url,
+                    details=['Check if service is up or set compute.url',
+                    '  to get service url: /config get compute.url',
+                    '  to set service url: /config set compute.url <URL>'])
+            raiseCLIError(ce)
         except Exception as err:
             raiseCLIError(err)
         self._print(server)

diff --git a/kamaki/clients/__init__.py b/kamaki/clients/__init__.py
index 8010541..9c2417a 100644 (file)
--- a/kamaki/clients/__init__.py
+++ b/kamaki/clients/__init__.py
@@ -215,7 +215,7 @@ class Client(object):
             if not errstr:
                 errstr = ('%s' % type(err))[7:-2]
             raise ClientError('%s\n' % errstr,
-                status=getattr(err, 'status', 0))
+                status=getattr(err, 'status', 0) or getattr(err, 'errno', 0))
 
         self.http_client.reset_headers()
         self.http_client.reset_params()

diff --git a/kamaki/clients/connection/errors.py b/kamaki/clients/connection/errors.py
index 1f7bb4c..790c2c6 100644 (file)
--- a/kamaki/clients/connection/errors.py
+++ b/kamaki/clients/connection/errors.py
@@ -33,10 +33,18 @@
 
 
 class HTTPConnectionError(Exception):
-    def __init__(self, message):
+    errno = None
+
+    def __init__(self, message, errno=None):
         super(HTTPConnectionError, self).__init__(message)
+        if errno:
+            self.errno = errno
 
 
 class HTTPResponseError(Exception):
-    def __init__(self, message):
+    errno = None
+
+    def __init__(self, message, errno=None):
         super(HTTPResponseError, self).__init__(message)
+        if errno:
+            self.errno = errno

diff --git a/kamaki/clients/connection/kamakicon.py b/kamaki/clients/connection/kamakicon.py
index f002bd7..2645f69 100644 (file)
--- a/kamaki/clients/connection/kamakicon.py
+++ b/kamaki/clients/connection/kamakicon.py
@@ -36,7 +36,7 @@ from objpool.http import get_http_connection
 from kamaki.clients.connection import HTTPConnection, HTTPResponse
 from kamaki.clients.connection.errors import HTTPConnectionError
 from kamaki.clients.connection.errors import HTTPResponseError
-from socket import gaierror
+from socket import gaierror, error
 
 from json import loads
 
@@ -175,13 +175,14 @@ class KamakiHTTPConnection(HTTPConnection):
                 url=str(self.path),
                 headers=http_headers,
                 body=data)
+        except IOError as ioe:
+            raise HTTPConnectionError(
+                'Cannot connect to %s: %s' % (self.url, ioe.strerror),
+                errno=ioe.errno)
         except Exception as err:
             from traceback import format_stack
             from kamaki.clients import recvlog
             recvlog.debug('\n'.join(['%s' % type(err)] + format_stack()))
             conn.close()
-            if isinstance(err, gaierror):
-                raise HTTPConnectionError(
-                    'Cannot connect to %s - %s' % (self.url, err))
             raise
         return KamakiHTTPResponse(conn)