python-chi 1.2.6__tar.gz → 1.2.7__tar.gz

python_chi-1.2.7/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v1.2.7
+------
+
+* Fix volume and server errors (#98)

{python_chi-1.2.6 → python_chi-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-chi
-Version: 1.2.6
+Version: 1.2.7
 Summary: Helper library for Chameleon Infrastructure (CHI) testbed
 Home-page: https://www.chameleoncloud.org
 Author: University of Chicago

{python_chi-1.2.6 → python_chi-1.2.7}/chi/container.py

@@ -18,6 +18,7 @@ import os
 import tarfile
 import time
 from typing import Dict, List, Optional, Tuple
+from warnings import warn
 
 from IPython.display import HTML, display
 from packaging.version import Version
@@ -28,7 +29,7 @@ from chi import network as chi_network
 
 from .clients import connection, zun
 from .context import session
-from .exception import ResourceError, ServiceError
+from .exception import ServiceError
 from .network import bind_floating_ip, get_free_floating_ip
 
 DEFAULT_IMAGE_DRIVER = "docker"
@@ -80,12 +81,17 @@ class Container:
         environment: Dict[str, str] = {},
         device_profiles: List[str] = [],
     ):
+
+        # check if values are not the defaults.
+        if not start or start_timeout != 0:
+            warn(
+                "start and start_timeout are deprecated. Containers always start immmediately."
+            )
+
         self.name = name
         self.image_ref = image_ref
         self.exposed_ports = exposed_ports
         self.reservation_id = reservation_id
-        self.start = start
-        self.start_timeout = start_timeout
         self.runtime = runtime
         self.id = None
         self.created_at = None
@@ -101,18 +107,20 @@ class Container:
             name=zun_container.name,
             image_ref=zun_container.image,
             exposed_ports=zun_container.ports if zun_container.ports else [],
-            start=True,  # Assuming the container is already created
         )
         container.id = zun_container.uuid
         container._status = zun_container.status
         return container
 
     @property
-    def status(self):
+    def zun_container(self):
         if self.id:
-            container = zun().containers.get(self.id)
-            self._status = container.status
-        return self._status
+            self._zun_container = zun().containers.get(self.id)
+            return self._zun_container
+
+    @property
+    def status(self):
+        return getattr(self.zun_container, "status")
 
     def submit(
         self,
@@ -155,21 +163,15 @@ class Container:
             image=self.image_ref,
             exposed_ports=self.exposed_ports,
             reservation_id=self.reservation_id,
-            start=self.start,
-            start_timeout=self.start_timeout,
             runtime=self.runtime,
             environment=self.environment,
             device_profiles=self.device_profiles,
             **kwargs,
         )
+        self.id = container.uuid
+        self._status = container.status
 
-        if container:
-            self.id = zun().containers.get(self.name).uuid
-            self._status = zun().containers.get(self.name).status
-        else:
-            raise ResourceError("could not create container")
-
-        if wait_for_active and self.status != "Running":
+        if wait_for_active and self._status != "Running":
             self.wait(status="Running", timeout=wait_timeout)
 
         if show:
@@ -189,7 +191,7 @@ class Container:
             None
         """
         if self.id:
-            destroy_container(self.id)
+            destroy_container(self.id, force=True)
             self.id = None
             self._status = None
 
@@ -212,13 +214,47 @@ class Container:
         if show == "widget" and context._is_ipynb():
             pb.display()
 
+        state = {"status": None, "since": time.perf_counter(), "conditions": {}}
+
+        def _zun_attr(obj, name):
+            val = getattr(obj, name, None)
+            return val if val and val != "None" else None
+
         def _callback():
-            # self.status is a property that refreshes itself
-            # NOTE: zun statuses are title case
-            if self.status.upper() == status.upper() or self.status == "Error":
-                print(f"Container has moved to status {self.status}")
-                return True
-            return False
+            zun_container = self.zun_container
+            now = time.perf_counter()
+            elapsed = int(now - state["since"])
+
+            current_status = getattr(zun_container, "status", None)
+            detail = _zun_attr(zun_container, "status_detail")
+            reason = _zun_attr(zun_container, "status_reason")
+
+            if current_status != state["status"]:
+                if state["status"]:
+                    pb.log(f"[{elapsed}s] {state['status']} -> {current_status}")
+                state["status"] = current_status
+                state["since"] = now
+                state["conditions"] = {}
+
+            if detail:
+                entry = state["conditions"].setdefault(detail, {"count": 0})
+                entry["count"] += 1
+                entry["reason"] = reason
+
+            parts = [f"{current_status} ({elapsed}s)"]
+            for name, entry in state["conditions"].items():
+                count = entry["count"]
+
+                if count > 1:
+                    line = f"{name} (x{count})"
+                else:
+                    line = name
+                if entry.get("reason"):
+                    line = f"{line} {entry['reason']}"
+                parts.append(line)
+            pb.update_status("\n".join(parts))
+
+            return current_status == "Error" or current_status.upper() == status.upper()
 
         res = pb.wait(_callback, 2 * 60, timeout)
         if not res:
@@ -369,9 +405,6 @@ def create_container(
     image: "str" = None,
     exposed_ports: "list[str]" = None,
     reservation_id: "str" = None,
-    start: "bool" = True,
-    start_timeout: "int" = None,
-    platform_version: "int" = 2,
     **kwargs,
 ):
     """
@@ -407,8 +440,6 @@ def create_container(
     hints = kwargs.setdefault("hints", {})
     if reservation_id:
         hints["reservation"] = reservation_id
-    if platform_version:
-        hints["platform_version"] = platform_version
 
     # Support simpler syntax for exposed_ports
     if exposed_ports and isinstance(exposed_ports, list):
@@ -429,20 +460,6 @@ def create_container(
         **kwargs,
     )
 
-    # Wait for a while, the image may need to download. 30 minutes is
-    # _quite_ a long time, but the user can interrupt or choose a smaller
-    # timeout.
-    timeout = start_timeout or (60 * 30)
-    LOG.info(f"Waiting up to {timeout}s for container creation ...")
-
-    if platform_version == 2:
-        container = _wait_for_status(container.uuid, "Running", timeout=timeout)
-    else:
-        container = _wait_for_status(container.uuid, "Created", timeout=timeout)
-        if start:
-            LOG.info("Starting container ...")
-            zun().containers.start(container.uuid)
-
     return container
 
 
@@ -498,7 +515,7 @@ def snapshot_container(
     return zun().containers.commit(container_ref, repository, tag=tag)["uuid"]
 
 
-def destroy_container(container_ref: "str"):
+def destroy_container(container_ref: "str", stop=False, force=False):
     """
     .. deprecated:: 1.0
 
@@ -509,7 +526,7 @@ def destroy_container(container_ref: "str"):
     Args:
         container_ref (str): The name or ID of the container.
     """
-    return zun().containers.delete(container_ref, stop=True)
+    return zun().containers.delete(container_ref, stop=stop, force=force)
 
 
 def get_logs(container_ref: "str", stdout=True, stderr=True):

{python_chi-1.2.6 → python_chi-1.2.7}/chi/server.py

@@ -76,7 +76,7 @@ class Server:
     Args:
         name (str): The name of the server.
         reservation_id (Optional[str]): The reservation ID associated with the server. Defaults to None.
-        image_name (str): The name of the image to use for the server. Defaults to DEFAULT_IMAGE_NAME.
+        image_name (Optional[str]): The name of the image to use for the server. Defaults to DEFAULT_IMAGE_NAME.
         image (Optional[str]): The image ID or name to use for the server. Defaults to None.
         flavor_name (str): The name of the flavor to use for the server. Defaults to BAREMETAL_FLAVOR.
         key_name (str): The name of the keypair to use for the server. Defaults to None.
@@ -86,7 +86,7 @@ class Server:
     Attributes:
         name (str): The name of the server.
         reservation_id (Optional[str]): The reservation ID associated with the server.
-        image_name (str): The name of the image used for the server.
+        image_name (Optional[str]): The name of the image used for the server.
         flavor_name (str): The name of the flavor used for the server.
         keypair (Optional[Keypair]): The keypair object used for the server.
         network_name (str): The name of the network used for the server.
@@ -104,7 +104,7 @@ class Server:
         self,
         name: str,
         reservation_id: Optional[str] = None,
-        image_name: str = DEFAULT_IMAGE_NAME,
+        image_name: Optional[str] = DEFAULT_IMAGE_NAME,
         image: Optional[Image] = None,
         flavor_name: str = BAREMETAL_FLAVOR,
         key_name: str = None,
@@ -114,8 +114,13 @@ class Server:
         self.name = name
         self.reservation_id = reservation_id or None
         # Add this once chi.image is implemented
-        self.image = image or chi.image.get_image(image_name)
-        self.image_name = self.image.name
+        if image:
+            self.image = image
+        elif image_name:
+            self.image = chi.image.get_image(image_name)
+        else:
+            self.image = None
+        self.image_name = self.image.name if self.image else None
         self.flavor_name = flavor_name
 
         if keypair:
@@ -216,10 +221,13 @@ class Server:
 
     @classmethod
     def _from_nova_server(cls, nova_server):
-        try:
-            image_id = nova_server.image["id"]
-        except Exception:
-            image_id = nova_server.image_id
+        if nova_server.image:
+            if isinstance(nova_server.image, dict):
+                image_id = nova_server.image.get("id")
+            else:
+                image_id = nova_server.image
+        else:
+            image_id = None
         flavor_name = nova_server.flavor.get("original_name", "")
 
         try:
@@ -238,7 +246,7 @@ class Server:
         server = cls(
             name=nova_server.name,
             reservation_id=None,
-            image_name=get_image_name(image_id),
+            image_name=get_image_name(image_id) if image_id else None,
             flavor_name=flavor_name,
             key_name=nova_server.key_name,
             network_name=(

{python_chi-1.2.6 → python_chi-1.2.7}/chi/storage.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import List
 
+import cinderclient
 import manilaclient
 import swiftclient
 
@@ -295,7 +296,7 @@ def get_volume(ref) -> Volume:
     """
     try:
         volume = cinder().volumes.get(ref)
-    except cinder.exceptions.NotFound:
+    except cinderclient.exceptions.NotFound:
         volumes = list(cinder().volumes.list(search_opts={"name": ref}))
         if not volumes:
             raise CHIValueError(f'No volumes found matching name "{ref}"')

{python_chi-1.2.6 → python_chi-1.2.7}/chi/util.py

@@ -1,4 +1,5 @@
 import base64
+import logging
 import os
 import time
 from datetime import datetime, timedelta
@@ -10,6 +11,8 @@ from IPython.display import display
 
 from chi.exception import ResourceError
 
+LOG = logging.getLogger(__name__)
+
 
 def random_base32(n_bytes):
     rand_bytes = os.urandom(n_bytes)
@@ -60,9 +63,45 @@ class TimerProgressBar:
             orientation="horizontal",
         )
         self.label = widgets.Label()
+        self.status_output = widgets.HTML()
+        self._log_lines = []
+        self._current_status_text = ""
+        self._is_displayed = False
 
     def display(self):
-        display(widgets.HBox([self.label, self.progress]))
+        display(
+            widgets.VBox(
+                [
+                    widgets.HBox([self.label, self.progress]),
+                    self.status_output,
+                ]
+            )
+        )
+        self._is_displayed = True
+
+    def log(self, msg):
+        self._log_lines.append(msg)
+        if self._is_displayed:
+            self._render()
+        else:
+            LOG.info(msg)
+
+    def update_status(self, msg):
+        self._current_status_text = msg
+        if self._is_displayed:
+            self._render()
+
+    def _render(self):
+        from html import escape
+
+        lines = list(self._log_lines)
+        if self._current_status_text:
+            lines.append(self._current_status_text)
+        inner = "\n".join(escape(line) for line in lines)
+        self.status_output.value = (
+            '<pre style="max-height:200px;overflow:auto;margin:4px 0;font-family:inherit;">'
+            f"{inner}</pre>"
+        )
 
     def wait(self, callback, expected_timeout, timeout, interval=5):
         """Wait and update the progress bar.

{python_chi-1.2.6 → python_chi-1.2.7}/python_chi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-chi
-Version: 1.2.6
+Version: 1.2.7
 Summary: Helper library for Chameleon Infrastructure (CHI) testbed
 Home-page: https://www.chameleoncloud.org
 Author: University of Chicago

python_chi-1.2.7/python_chi.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "dfbd927", "is_release": false}

python_chi-1.2.7/setup.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(setup_requires=["pbr"], pbr=True, version="v1.2.7")

python_chi-1.2.7/tests/test_container.py

@@ -0,0 +1,275 @@
+# Copyright 2021 University of Chicago
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import io
+import os
+import tarfile
+import tempfile
+from datetime import datetime
+
+import pytest
+from zunclient.exceptions import Conflict
+
+from chi.container import Container, download, upload
+
+
+@pytest.fixture()
+def now():
+    return datetime(2021, 1, 1, 0, 0, 0, 0)
+
+
+def test_container_upload_method(mocker):
+    # Arrange
+    mock_upload = mocker.patch("chi.container.upload")
+    container = Container(
+        name="test",
+        image_ref="image",
+        exposed_ports=[],
+    )
+    container.id = "fake_id"
+    source = "/tmp/sourcefile"
+    remote_dest = "/container/path"
+
+    # Act
+    container.upload(source, remote_dest)
+
+    # Assert
+    mock_upload.assert_called_once_with("fake_id", source, remote_dest)
+
+
+def test_container_download_method(mocker):
+    # Arrange
+    mock_download = mocker.patch("chi.container.download")
+    container = Container(
+        name="test",
+        image_ref="image",
+        exposed_ports=[],
+    )
+    container.id = "fake_id"
+    remote_source = "/container/path"
+    dest = "/tmp/destfile"
+
+    # Act
+    container.download(remote_source, dest)
+
+    # Assert
+    mock_download.assert_called_once_with("fake_id", remote_source, dest)
+
+
+def test_upload_creates_tar_and_calls_put_archive(mocker):
+    # Patch zun client
+    zun_mock = mocker.patch("chi.container.zun")()
+    # Create a temporary file to upload
+    with tempfile.NamedTemporaryFile() as tmpfile:
+        tmpfile.write(b"hello world")
+        tmpfile.flush()
+
+        upload("container_id", tmpfile.name, "/remote/path")
+        # Check that put_archive was called
+        assert zun_mock.containers.put_archive.call_count == 1
+        args = zun_mock.containers.put_archive.call_args[0]
+        assert args[0] == "container_id"
+        assert args[1] == "/remote/path"
+        # The third argument should be a tar archive containing the file
+        tar_bytes = args[2]
+        tarfileobj = io.BytesIO(tar_bytes)
+        with tarfile.open(fileobj=tarfileobj, mode="r") as tar:
+            names = tar.getnames()
+            assert os.path.basename(tmpfile.name) in names
+
+
+def test_download_extracts_tar_and_writes_file(mocker):
+    # Patch zun client
+    zun_mock = mocker.patch("chi.container.zun")()
+    # Create a tar archive in memory with a test file
+    file_content = b"test content"
+    file_name = "testfile.txt"
+    tar_bytes_io = io.BytesIO()
+    with tarfile.open(fileobj=tar_bytes_io, mode="w") as tar:
+        info = tarfile.TarInfo(name=file_name)
+        info.size = len(file_content)
+        tar.addfile(info, io.BytesIO(file_content))
+    tar_bytes = tar_bytes_io.getvalue()
+    zun_mock.containers.get_archive.return_value = {"data": tar_bytes}
+
+    # Use a temporary directory for extraction
+    with tempfile.TemporaryDirectory() as tmpdir:
+        dest_path = os.path.join(tmpdir, file_name)
+
+        download("container_id", file_name, tmpdir)
+        # Check that the file was extracted
+        assert os.path.exists(dest_path)
+        with open(dest_path, "rb") as f:
+            assert f.read() == file_content
+
+
+def test_delete_calls_force(mocker):
+    destroy_mock = mocker.patch("chi.container.destroy_container")
+    container = Container(name="test", image_ref="img")
+    container.id = "fake-id"
+
+    container.delete()
+
+    destroy_mock.assert_called_once_with("fake-id", force=True)
+    assert container.id is None
+    assert container._status is None
+
+
+def test_submit_idempotent_returns_existing_without_create(mocker):
+    # idempotent=true, wait=true
+    chi_container = Container(name="dup-name", image_ref="img")
+    existing_zun_container = mocker.Mock(uuid="existing-uuid", status="Running")
+
+    mocker.patch("chi.container.get_container", return_value=existing_zun_container)
+    create_mock = mocker.patch("chi.container.create_container")
+
+    submit_result = chi_container.submit(
+        idempotent=True, wait_for_active=True, wait_timeout=123, show="text"
+    )
+    create_mock.assert_not_called()
+    existing_zun_container.wait.assert_called_once_with(status="Running", timeout=123)
+    existing_zun_container.show.assert_called_once_with(
+        type="text", wait_for_active=True
+    )
+
+    # submit returns only on idempotent=true
+    assert submit_result is existing_zun_container
+
+
+def test_submit_idempotent_returns_existing_without_create_no_wait(mocker):
+    # idempotent=true, wait=false
+    chi_container = Container(name="dup-name", image_ref="img")
+    existing_zun_container = mocker.Mock(uuid="existing-uuid", status="Running")
+
+    mocker.patch("chi.container.get_container", return_value=existing_zun_container)
+    create_mock = mocker.patch("chi.container.create_container")
+
+    submit_result = chi_container.submit(
+        idempotent=True, wait_for_active=False, show=None
+    )
+    create_mock.assert_not_called()
+    existing_zun_container.wait.assert_not_called()
+    existing_zun_container.show.assert_not_called()
+
+    # submit returns only on idempotent=true
+    assert submit_result is existing_zun_container
+
+
+def test_submit_duplicate_name_tracks_created_uuid(mocker):
+    """Test the case where we re-run submit after a failure.
+
+    An "old" container alreday already exists, with name = "dup-name".
+    If idempotent=false, it should be possible to make a new container with the same name.
+    However, name-based lookups will fail with a 409.
+    """
+
+    chi_container = Container(name="dup-name", image_ref="img")
+    new_zun_container = mocker.Mock(uuid="new-uuid", status="Running")
+
+    def _get_side_effect(ref):
+        if ref == "dup-name":
+            raise Conflict(
+                "Multiple containers exist with same name. Please use the container uuid instead."
+            )
+        if ref == "new-uuid":
+            return new_zun_container
+        raise AssertionError(ref)
+
+    mocker.patch("chi.container.create_container", return_value=new_zun_container)
+    zun_mock = mocker.patch("chi.container.zun")()
+    zun_mock.containers.get.side_effect = _get_side_effect
+
+    # disable optional behavor from wait_for_active and show
+    chi_container.submit(wait_for_active=False, show=None)
+    assert chi_container.id == "new-uuid"
+
+
+# --- Container.wait() status display tests ---
+
+
+def _make_zun_state(mocker, status, detail=None, reason=None):
+    return mocker.Mock(status=status, status_detail=detail, status_reason=reason)
+
+
+def _setup_wait(mocker, states):
+    """Common setup for wait tests: mock zun, ipynb check, and progress bar."""
+    container = Container(name="t", image_ref="img")
+    container.id = "fake"
+
+    zun_mock = mocker.patch("chi.container.zun")()
+    zun_mock.containers.get.side_effect = states
+    mocker.patch("chi.container.context._is_ipynb", return_value=False)
+
+    pb_cls = mocker.patch("chi.container.util.TimerProgressBar")
+    pb = pb_cls.return_value
+
+    def fake_wait(cb, expected, timeout, interval=5):
+        for _ in states:
+            if cb():
+                return True
+        return False
+
+    pb.wait.side_effect = fake_wait
+    return container, pb
+
+
+def test_wait_logs_status_transitions(mocker):
+    """Status changes produce log lines; same status does not."""
+    states = [
+        _make_zun_state(mocker, "Creating"),
+        _make_zun_state(mocker, "Creating"),
+        _make_zun_state(mocker, "Running"),
+    ]
+    container, pb = _setup_wait(mocker, states)
+
+    container.wait(status="Running")
+
+    log_calls = [c.args[0] for c in pb.log.call_args_list]
+    assert any("Running" in log for log in log_calls)
+    assert len(log_calls) == 1  # one transition
+
+
+def test_wait_accumulates_events_without_duplicates(mocker):
+    """Different details accumulate; same detail is not repeated."""
+    states = [
+        _make_zun_state(mocker, "Creating", detail="Pulling image"),
+        _make_zun_state(mocker, "Creating", detail="Pulling image"),
+        _make_zun_state(mocker, "Creating", detail="Configuring net"),
+        _make_zun_state(mocker, "Running"),
+    ]
+    container, pb = _setup_wait(mocker, states)
+
+    captured_updates = []
+    pb.update_status.side_effect = lambda msg: captured_updates.append(msg)
+
+    container.wait(status="Running")
+
+    creating_updates = [u for u in captured_updates if "Creating" in u]
+    last_creating = creating_updates[-1]
+    assert "Pulling image" in last_creating
+    assert "Configuring net" in last_creating
+    assert last_creating.count("Pulling image") == 1
+
+
+def test_wait_stops_on_error(mocker):
+    """Error status stops the wait loop and is logged."""
+    states = [
+        _make_zun_state(mocker, "Creating"),
+        _make_zun_state(mocker, "Error", detail="OOM", reason="Out of memory"),
+    ]
+    container, pb = _setup_wait(mocker, states)
+
+    container.wait(status="Running")
+
+    log_calls = [c.args[0] for c in pb.log.call_args_list]
+    assert any("Error" in log for log in log_calls)

python_chi-1.2.6/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v1.2.6
-------
-
-* Kvm improvments (#90)

python_chi-1.2.6/python_chi.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "f691d6a", "is_release": false}

python_chi-1.2.6/setup.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-
-setup(setup_requires=["pbr"], pbr=True, version="v1.2.6")

python_chi-1.2.6/tests/test_container.py

@@ -1,112 +0,0 @@
-# Copyright 2021 University of Chicago
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import io
-import os
-import tarfile
-import tempfile
-from datetime import datetime
-
-import pytest
-
-from chi.container import Container, download, upload
-
-
-@pytest.fixture()
-def now():
-    return datetime(2021, 1, 1, 0, 0, 0, 0)
-
-
-def test_container_upload_method(mocker):
-    # Arrange
-    mock_upload = mocker.patch("chi.container.upload")
-    container = Container(
-        name="test",
-        image_ref="image",
-        exposed_ports=[],
-    )
-    container.id = "fake_id"
-    source = "/tmp/sourcefile"
-    remote_dest = "/container/path"
-
-    # Act
-    container.upload(source, remote_dest)
-
-    # Assert
-    mock_upload.assert_called_once_with("fake_id", source, remote_dest)
-
-
-def test_container_download_method(mocker):
-    # Arrange
-    mock_download = mocker.patch("chi.container.download")
-    container = Container(
-        name="test",
-        image_ref="image",
-        exposed_ports=[],
-    )
-    container.id = "fake_id"
-    remote_source = "/container/path"
-    dest = "/tmp/destfile"
-
-    # Act
-    container.download(remote_source, dest)
-
-    # Assert
-    mock_download.assert_called_once_with("fake_id", remote_source, dest)
-
-
-def test_upload_creates_tar_and_calls_put_archive(mocker):
-    # Patch zun client
-    zun_mock = mocker.patch("chi.container.zun")()
-    # Create a temporary file to upload
-    with tempfile.NamedTemporaryFile() as tmpfile:
-        tmpfile.write(b"hello world")
-        tmpfile.flush()
-
-        upload("container_id", tmpfile.name, "/remote/path")
-        # Check that put_archive was called
-        assert zun_mock.containers.put_archive.call_count == 1
-        args = zun_mock.containers.put_archive.call_args[0]
-        assert args[0] == "container_id"
-        assert args[1] == "/remote/path"
-        # The third argument should be a tar archive containing the file
-        tar_bytes = args[2]
-        tarfileobj = io.BytesIO(tar_bytes)
-        with tarfile.open(fileobj=tarfileobj, mode="r") as tar:
-            names = tar.getnames()
-            assert os.path.basename(tmpfile.name) in names
-
-
-def test_download_extracts_tar_and_writes_file(mocker):
-    # Patch zun client
-    zun_mock = mocker.patch("chi.container.zun")()
-    # Create a tar archive in memory with a test file
-    file_content = b"test content"
-    file_name = "testfile.txt"
-    tar_bytes_io = io.BytesIO()
-    with tarfile.open(fileobj=tar_bytes_io, mode="w") as tar:
-        info = tarfile.TarInfo(name=file_name)
-        info.size = len(file_content)
-        tar.addfile(info, io.BytesIO(file_content))
-    tar_bytes = tar_bytes_io.getvalue()
-    zun_mock.containers.get_archive.return_value = {"data": tar_bytes}
-
-    # Use a temporary directory for extraction
-    with tempfile.TemporaryDirectory() as tmpdir:
-        dest_path = os.path.join(tmpdir, file_name)
-
-        download("container_id", file_name, tmpdir)
-        # Check that the file was extracted
-        assert os.path.exists(dest_path)
-        with open(dest_path, "rb") as f:
-            assert f.read() == file_content