Clean exceptions

cloudcontrol/node/hypervisor/__init__.py

@@ -16,7 +16,7 @@ from cloudcontrol.node.tags import Tag, tag_inspector, get_tags
 from cloudcontrol.node.hypervisor import tags
 from cloudcontrol.node.hypervisor.kvm import KVM
 from cloudcontrol.node.exc import (
-    UndefinedDomain, DRBDError, VMMigrationError,
+    UndefinedDomain, DRBDError, VMMigrationError, PoolStorageError
 )
 from cloudcontrol.node.hypervisor.jobs import (
     ImportVolume, ExportVolume, TCPTunnel, DRBD,
@@ -584,11 +584,11 @@ class Handler(HostHandler):
         try:
             pool = self.hypervisor.storage.get_storage(pool)
             if pool is None:
-                raise Exception('Pool storage does not exist')  # TODO exc
+                raise PoolStorageError('Pool storage does not exist')
 
             volume = pool.volumes.get(name)
             if volume is None:
-                raise Exception('Volume does not exist')
+                raise PoolStorageError('Volume does not exist')
 
             # create the job
             job = self.main.job_manager.create(ImportVolume, volume)
@@ -627,12 +627,12 @@ class Handler(HostHandler):
         pool = self.hypervisor.storage.get_storage(pool)
 
         if pool is None:
-            raise Exception('Pool storage does not exist')
+            raise PoolStorageError('Pool storage does not exist')
 
         volume = pool.volumes.get(name)
 
         if volume is None:
-            raise Exception('Volume does not exist')
+            raise PoolStorageError('Volume does not exist')
 
         try:
             job = self.main.job_manager.create(ExportVolume, volume, raddr, rport)