Make ContainerManagerError inherit from RemoteProcedureCallError.

So it can be re-raised and caught by name on the client-side.

src/commissaire/bus/__init__.py

@@ -71,6 +71,23 @@ def __init__(self, message, model=None, data={}):
         super().__init__(message, code, data)
 
 
+class ContainerManagerError(RemoteProcedureCallError):
+    """
+    Exception class for container manager errors.
+    """
+    def __init__(self, message, data={}):
+        """
+        Creates a ContainerManagerError instance.
+
+        :param message: Error message
+        :type message: str
+        :param data: Additional error data
+        :type data: dict
+        """
+        code = C.JSONRPC_ERRORS['CONTAINER_MANAGER_ERROR']
+        super().__init__(message, code, data)
+
+
 class BusMixin:
     """
     Common methods for classes which utilize the Commissaire bus.
@@ -170,6 +187,8 @@ def request(self, routing_key, params={}, **kwargs):
             data = error_data.get('data', {})
             if code == C.JSONRPC_ERRORS['STORAGE_LOOKUP_ERROR']:
                 raise StorageLookupError(message, data=data)
+            elif code == C.JSONRPC_ERRORS['CONTAINER_MANAGER_ERROR']:
+                raise ContainerManagerError(message, data=data)
             else:
                 raise RemoteProcedureCallError(message, code, data)
 

src/commissaire/constants.py

@@ -61,6 +61,7 @@
 
     # These map to Exception classes
     'STORAGE_LOOKUP_ERROR': -20000,
+    'CONTAINER_MANAGER_ERROR': -20001,
 
     # Custom codes
     'NOT_FOUND': 404,

src/commissaire/containermgr/__init__.py

@@ -19,13 +19,6 @@
 import logging
 
 
-class ContainerManagerError(Exception):
-    """
-    Base Exception class for ContainerManager related errors.
-    """
-    pass
-
-
 class ContainerManagerBase(object):  # pragma: no cover
     """
     Base class for all container managers.
@@ -48,7 +41,7 @@ def node_registered(self, address):
 
         :param address: Address of the node
         :type address: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         raise NotImplementedError(
             'ContainerManagerBase().node_registered() must be overridden.')
@@ -59,7 +52,7 @@ def register_node(self, address):
 
         :param address: Address of the node
         :type address: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         raise NotImplementedError(
             'ContainerManagerBase().register_node() must be overridden.')
@@ -70,7 +63,7 @@ def remove_node(self, address):
 
         :param address: Address of the node
         :type address: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         raise NotImplementedError(
             'ContainerManagerBase().remove_node() must be overridden.')
@@ -79,7 +72,7 @@ def remove_all_nodes(self):
         """
         Removes all nodes from the container manager.
 
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         raise NotImplementedError(
             'ContainerManagerBase().remove_all_nodes() must be overridden.')
@@ -92,7 +85,7 @@ def get_node_status(self, address):
         :type address: str
         :returns: Status of the node according to the container manager
         :rtype: dict
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         raise NotImplementedError(
             'ContainerManagerBase().get_node_status() must be overridden.')

src/commissaire/containermgr/kubernetes/__init__.py

@@ -21,8 +21,8 @@
 
 from urllib.parse import urljoin, urlparse
 
-from commissaire.containermgr import (
-    ContainerManagerBase, ContainerManagerError)
+from commissaire.bus import ContainerManagerError
+from commissaire.containermgr import ContainerManagerBase
 from commissaire.util.config import ConfigurationError
 
 
@@ -209,7 +209,7 @@ def register_node(self, name):
 
         :param name: The name of the node.
         :type name: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         part = '/nodes'
 
@@ -236,7 +236,7 @@ def remove_node(self, name):
 
         :param name: The name of the node.
         :type name: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         part = '/nodes/{}'.format(name)
 
@@ -253,7 +253,7 @@ def remove_all_nodes(self):
         """
         Removes all nodes from the Kubernetes Container Manager.
 
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         resp = self._delete('/nodes')
         if resp.status_code != 200:
@@ -270,7 +270,7 @@ def node_registered(self, name):
 
         :param name: The name of the node.
         :type name: str
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         part = '/nodes/{0}'.format(name)
         resp = self._get(part)
@@ -290,7 +290,7 @@ def get_node_status(self, name, raw=False):
         :type raw: bool
         :returns: The response back from kubernetes.
         :rtype: dict
-        :raises: commissaire.containermgr.ContainerManagerError
+        :raises: commissaire.bus.ContainerManagerError
         """
         part = '/nodes/{}'.format(name)
         resp = self._get(part)

test/test_containermgr_kubernetes.py

@@ -22,7 +22,8 @@
 
 from . import TestCase, mock
 
-from commissaire.containermgr import ContainerManagerError, kubernetes
+from commissaire.bus import ContainerManagerError
+from commissaire.containermgr import kubernetes
 from commissaire.util.config import ConfigurationError