Submit raises ResourceError with reason

Small change, container.submit() now raises a ResourceError, with
the human readable cause from the zun container.

For debugging, the traceback includes the original WaitError with
more info. This should preserve compatability with anything that
currently calls "submit" inside a try except block.

Author: msherman64

chi/container.py

@@ -28,7 +28,7 @@
 
 from .clients import connection, zun
 from .context import session
-from .exception import ContainerCreateWaitError, ServiceError
+from .exception import ContainerCreateWaitError, ResourceError, ServiceError
 from .network import bind_floating_ip, get_free_floating_ip
 
 DEFAULT_IMAGE_DRIVER = "docker"
@@ -131,7 +131,7 @@ def submit(
             idempotent (bool, optional): Whether to update the existing container if it already exists. Defaults to False.
 
         Raises:
-            ContainerCreateWaitError: If the container creation fails.
+            ResourceError: If the container creation fails.
 
         Returns:
             None
@@ -169,7 +169,7 @@ def submit(
             # ensure container object gets params even on error
             self.id = exc.zun_container.uuid
             self._status = exc.zun_container.status
-            raise
+            raise ResourceError(message=exc.zun_container.status_reason) from exc
 
         if wait_for_active and self.status != "Running":
             self.wait(status="Running", timeout=wait_timeout)

chi/exception.py

@@ -30,13 +30,16 @@ def __init__(self, message):
         super().__init__(message)
 
 
-class ContainerCreateWaitError(RuntimeError):
+class ContainerCreateWaitError(ResourceError):
     """Raised when Zun creates a container but waiting for target status fails."""
 
     def __init__(self, zun_container, cause):
         self.zun_container = zun_container
         self.cause = cause
         message = (
-            f"Container {self.zun_container.uuid} was created, but waiting for target status failed: {cause}"
+            "Container {} was created, but waiting for target status failed: {}".format(
+                self.zun_container.uuid, 
+                cause,
+                )
         )
         super().__init__(message)

tests/test_container.py

@@ -21,7 +21,7 @@
 from zunclient.exceptions import Conflict
 
 from chi.container import Container, download, upload
-from chi.exception import ContainerCreateWaitError
+from chi.exception import ContainerCreateWaitError, ResourceError
 
 
 @pytest.fixture()
@@ -170,7 +170,7 @@ def test_submit_preserves_reference_on_create_wait_failure(mocker):
     zun_mock = mocker.patch("chi.container.zun")()
     zun_mock.containers.get.return_value = leaked_zun_container
 
-    with pytest.raises(ContainerCreateWaitError):
+    with pytest.raises(ResourceError):
         chi_container.submit(wait_for_active=False, show=None)
 
     assert chi_container.id == "leaked-uuid"