testcloud 0.9.11__tar.gz → 0.9.13__tar.gz

{testcloud-0.9.11/testcloud.egg-info → testcloud-0.9.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testcloud
-Version: 0.9.11
+Version: 0.9.13
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Home-page: https://pagure.io/testcloud
 Author: Mike Ruckman
@@ -8,6 +8,12 @@ Author-email: roshi@fedoraproject.org
 License: GPLv2+
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Jinja2
+Requires-Dist: libvirt-python
+Requires-Dist: requests
+Requires-Dist: packaging
+Provides-Extra: image-resolve-caching
+Requires-Dist: requests_cache>=1.2; extra == "image-resolve-caching"
 
 # testcloud
 
@@ -255,10 +261,14 @@ new instance using **testcloud**.
 \--nic_number
 
 : To provide nic number you want
-\--virtiofs
 
+\--virtiofs
 : To specify a local directory to mount and mount target like <host path>:<guest path>
 
+\--iommu
+
+: To provide virtual iommu device
+
 There are several additional options that can be used to create a
 new Coreos instance using **testcloud**.
 

{testcloud-0.9.11 → testcloud-0.9.13}/README.md

@@ -244,10 +244,14 @@ new instance using **testcloud**.
 \--nic_number
 
 : To provide nic number you want
-\--virtiofs
 
+\--virtiofs
 : To specify a local directory to mount and mount target like <host path>:<guest path>
 
+\--iommu
+
+: To provide virtual iommu device
+
 There are several additional options that can be used to create a
 new Coreos instance using **testcloud**.
 

{testcloud-0.9.11 → testcloud-0.9.13}/conf/settings-example.py

@@ -31,9 +31,18 @@
 ## Read http://cloudinit.readthedocs.io/en/latest/topics/examples.html to see
 ## what options you can use here.
 #USER_DATA = """#cloud-config
-#password: %s
-#chpasswd: { expire: False }
-#ssh_pwauth: True
+#ssh_pwauth: true
+#password: ${password}
+#chpasswd:
+#  expire: false
+#users:
+#  - default
+#  - name: cloud-user
+#    plain_text_passwd: ${password}
+#    sudo: ALL=(ALL) NOPASSWD:ALL
+#    lock_passwd: false
+#runcmd:
+#${runcommands}
 #"""
 
 #COREOS_DATA = """variant: fcos
@@ -67,6 +76,12 @@
 # 0 = unlimited
 BACKINGSTORE_SIZE = 4
 
+# Is reusing the local image url cache an option?
+#CACHE_IMAGES = True
+
+# # How old can a local image url cache be to take it as viable
+#TRUST_DEADLINE = 7 # Days
+
 # ram size, in MiB
 #RAM = 768
 #RAM_COREOS = 2048

{testcloud-0.9.11 → testcloud-0.9.13}/docs/source/conf.py

@@ -55,7 +55,7 @@ copyright = u'2016-2023, testCloud devs'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.11'
+version = '0.9.13'
 # The full version, including alpha/beta/rc tags.
 release = version
 

{testcloud-0.9.11 → testcloud-0.9.13}/setup.py

@@ -54,5 +54,7 @@ setup(name='testcloud',
           'Jinja2',
           'libvirt-python',
           'requests',
+          'packaging'
       ],
+      extras_require={"image_resolve_caching": ["requests_cache>=1.2"]}
       )

{testcloud-0.9.11 → testcloud-0.9.13}/test/test_instance.py

@@ -9,8 +9,14 @@ import os
 
 from unittest import mock
 
-from testcloud import instance, image, config
+from testcloud import instance, image, config, domain_configuration
 
+class dotdict(dict):
+    # https://stackoverflow.com/a/23689767
+    """dot.notation access to dictionary attributes"""
+    __getattr__ = dict.get
+    __setattr__ = dict.__setitem__
+    __delattr__ = dict.__delitem__
 
 class TestInstance:
 
@@ -60,6 +66,10 @@ class TestFindInstance(object):
         stub_listdir.return_value = [ref_name]
         monkeypatch.setattr(os, 'listdir', stub_listdir)
 
+        stub_data_dir = mock.Mock()
+        stub_data_dir.return_value = dotdict({"DATA_DIR": self.conf.DATA_DIR})
+        monkeypatch.setattr(config, 'get_config', stub_data_dir)
+
         test_instance = instance.find_instance(ref_name, ref_image)
 
         assert test_instance.path == ref_path

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/__init__.py

@@ -1,2 +1,2 @@
 # NOTE: if you update version, *make sure* to also update `docs/source/conf.py`
-__version__ = '0.9.11'
+__version__ = '0.9.13'

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/cli.py

@@ -26,6 +26,7 @@ from testcloud import instance
 
 from testcloud.domain_configuration import _get_default_domain_conf
 from testcloud.util import get_image_url
+from testcloud.workarounds import Workarounds
 from testcloud.exceptions import TestcloudImageError, TestcloudPermissionsError, TestcloudInstanceError
 
 
@@ -58,7 +59,7 @@ def _handle_connection_tip(ip, port, vagrant=False):
     config_altered = False
     kind = ""
 
-    if "#cloud-config\nssh_pwauth: true\npassword: %s\nchpasswd:\n  expire: false\n" not in config_data.USER_DATA:
+    if "#cloud-config\nssh_pwauth: true\npassword: ${password}\nchpasswd:\n  expire: false\n" not in config_data.USER_DATA:
         config_altered = True
 
     print("-"*80)
@@ -79,7 +80,6 @@ def _handle_connection_tip(ip, port, vagrant=False):
             print("ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null cloud-user@%s -p %d" % (ip, port))
 
     print("-"*80)
-
     if port != 22:
         print("Due to limitations of tescloud's user session VMs and bugs in some systems,"
               " the ssh connection may not be available immediately...")
@@ -334,23 +334,17 @@ def _create_instance(args):
              )
         sys.exit(1)
 
-    url = None
-    coreos = False
-
     try:
         url = get_image_url(args.url, arch=args.arch) if not any([prot in args.url for prot in ["http", "file"]]) else args.url
-    except TestcloudImageError:
-        pass
-
-    if not url:
+        assert url
+    except (TestcloudImageError, AssertionError):
         log.error("Couldn't find the desired image ( %s )..." % args.url)
         sys.exit(1)
 
-    if "coreos" in url:
-        coreos = True
+    coreos = bool(re.search('coreos|rhcos', url.lower()))
 
+    virtiofs_split = args.virtiofs.split(":") if args.virtiofs else [None, None]
     if args.virtiofs:
-        virtiofs_split = args.virtiofs.split(":")
         if len(virtiofs_split) != 2:
             log.error("Invalid format of virtiofs specification, use <host path>:<guest path>")
             sys.exit(1)
@@ -358,6 +352,12 @@ def _create_instance(args):
             log.error("virtiofs is unsupported in session mode by libvirt: https://gitlab.com/libvirt/libvirt/-/issues/535")
             sys.exit(1)
 
+    # See the iommu support status at https://libvirt.org/formatdomain.html#iommu-devices
+    if args.iommu:
+        if args.arch not in ["x86_64", "aarch64"]:
+            log.error("iommu is not support for the architecture {0}, use x86_64 or aarch64".format(args.arch))
+            sys.exit(1)
+
     tc_image = image.Image(url)
     try:
         tc_image.prepare()
@@ -380,24 +380,25 @@ def _create_instance(args):
     domain = _get_default_domain_conf(name=args.name,
                                       desired_arch=args.arch,
                                       connection=args.connection,
-                                      image=tc_image,
+                                      backingstore_image=tc_image,
                                       coreos=coreos,
                                       vcpus=args.vcpus,
                                       ram=ram,
                                       disk_size=disk_size,
-                                      disk_number=args.disk_number,
-                                      nic_number=args.nic_number,
+                                      disk_count=args.disk_number,
+                                      nic_count=args.nic_number,
                                       tpm=args.tpm,
-                                      serial=args.serial,
+                                      iommu=args.iommu,
+                                      use_disk_serial=args.serial,
                                       virtiofs_source=virtiofs_split[0],
                                       virtiofs_target=virtiofs_split[1]
                                       )
 
-    tc_instance = instance.Instance(args.name,
+    tc_instance = instance.Instance(domain_configuration=domain,
                                     image=tc_image,
                                     connection=args.connection,
                                     desired_arch=args.arch,
-                                    domain_configuration=domain
+                                    workarounds=Workarounds(defaults=True)
                                     )
     log.info("create %s instance %s" % ("coreos" if coreos else "cloud", args.name))
 
@@ -420,6 +421,10 @@ def _create_instance(args):
         else:
             tc_instance._remove_from_disk()
 
+    if args.dry:
+        tc_instance._remove_from_disk()
+        sys.exit(0)
+
     # create instance domain
     try:
         tc_instance.spawn_vm()
@@ -790,6 +795,9 @@ def get_argparser():
     instarg_create.add_argument("--keep",
                                 help="Don't remove instance from disk when something fails, useful for debugging",
                                 action="store_true")
+    instarg_create.add_argument("--dry",
+                                help="Don't spawn an actual instance, useful for debugging",
+                                action="store_true")
     instarg_create.add_argument("--ssh_path",
                                 help="specify your ssh pubkey path",
                                 type=str)
@@ -822,6 +830,9 @@ def get_argparser():
     instarg_create.add_argument("--virtiofs",
                                  type=str,
                                  help="specify a local directory to mount and mount target like <host path>:<guest path>")
+    instarg_create.add_argument("--iommu",
+                                help="add iommu device",
+                                action="store_true")
     imgarg = subparsers.add_parser("image", help="help on image options")
     imgarg_subp = imgarg.add_subparsers(title="subcommands",
                                         description="Types of commands available",

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/config.py

@@ -102,10 +102,6 @@ class ConfigData(object):
     DATA_DIR = "/var/lib/testcloud"
     STORE_DIR = "/var/lib/testcloud/backingstores"
 
-    # libvirt domain XML Template
-    # This lives either in the DEFAULT_CONF_DIR or DATA_DIR
-    XML_TEMPLATE = "domain-template.jinja"
-
     # Data for cloud-init
 
     PASSWORD = 'passw0rd'
@@ -116,32 +112,17 @@ local-hostname: %s
 """
     USER_DATA = """#cloud-config
 ssh_pwauth: true
-password: %s
+password: ${password}
 chpasswd:
   expire: false
 users:
   - default
   - name: cloud-user
-    plain_text_passwd: %s
+    plain_text_passwd: ${password}
     sudo: ALL=(ALL) NOPASSWD:ALL
     lock_passwd: false
 runcmd:
-  - sed -i -e '/^.*PermitRootLogin/s/^.*$/PermitRootLogin yes/'
-    -e '/^.*UseDNS/s/^.*$/UseDNS no/'
-    -e '/^.*GSSAPIAuthentication/s/^.*$/GSSAPIAuthentication no/'
-    /etc/ssh/sshd_config
-  - systemctl reload sshd
-  - [sh, -c, 'if [ ! -f /etc/systemd/network/20-tc-usernet.network ] &&
-  systemctl status systemd-networkd | grep -q "enabled;\\svendor\\spreset:\\senabled";
-  then mkdir -p /etc/systemd/network/ &&
-  echo "[Match]" >> /etc/systemd/network/20-tc-usernet.network &&
-  echo "Name=en*" >> /etc/systemd/network/20-tc-usernet.network &&
-  echo "[Network]" >> /etc/systemd/network/20-tc-usernet.network &&
-  echo "DHCP=yes" >> /etc/systemd/network/20-tc-usernet.network; fi']
-  - [sh, -c, 'if systemctl status systemd-networkd | grep -q "enabled;\\svendor\\spreset:\\senabled"; then
-  systemctl restart systemd-networkd; fi']
-  - [sh, -c, 'if cat /etc/os-release | grep -q platform:el8; then systemctl restart sshd; fi']
-  - [sh, -c, 'dhclient || :']
+${runcommands}
 """
     COREOS_DATA = """variant: fcos
 version: 1.4.0
@@ -183,6 +164,12 @@ storage:
     # 0 = unlimited
     BACKINGSTORE_SIZE = 0
 
+    # Is reusing the local image url cache an option?
+    CACHE_IMAGES = True
+
+    # How old can a local image url cache be to take it as viable
+    TRUST_DEADLINE = 7 # Days
+
     # ram size, in MiB
     RAM = 768
     RAM_COREOS = 2048
@@ -234,44 +221,46 @@ storage:
     # Used to try to auto-fetch the latest qcow2
     CENTOS_STREAM_URL_PREFIX = "https://cloud.centos.org/centos/{0}-stream/{1}/images/"
     CENTOS_STREAM_VERSIONS = {
-        "8":      "https://cloud.centos.org/centos/8-stream/{0}/images/CentOS-Stream-GenericCloud-8-20220913.0.{0}.qcow2",
-        "9":      "https://cloud.centos.org/centos/9-stream/{0}/images/CentOS-Stream-GenericCloud-9-20230307.0.{0}.qcow2",
+        "8":      "https://cloud.centos.org/centos/8-stream/{0}/images/CentOS-Stream-GenericCloud-8-20240603.0.{0}.qcow2",
+        "9":      "https://cloud.centos.org/centos/9-stream/{0}/images/CentOS-Stream-GenericCloud-9-20240715.0.{0}.qcow2",
+        "10":     "https://odcs.stream.centos.org/stream-10/production/CentOS-Stream-10-20240709.0/compose/BaseOS/{0}/images/CentOS-Stream-GenericCloud-10-20240709.0.{0}.qcow2",
         "latest": "9"
     }
 
     ROCKY_URL_PREFIX = "https://download.rockylinux.org/pub/rocky/{0}/images/{1}/"
     ROCKY_VERSIONS = {
-        "8":      "https://download.rockylinux.org/pub/rocky/8/images/{0}/Rocky-8-GenericCloud-Base-8.7-20230215.0.{0}.qcow2",
-        "9":      "https://download.rockylinux.org/pub/rocky/9/images/{0}/Rocky-9-GenericCloud-Base-9.1-20230215.0.{0}.qcow2",
+        "8":      "https://download.rockylinux.org/pub/rocky/8/images/{0}/Rocky-8-GenericCloud-Base-8.10-20240528.0.{0}.qcow2",
+        "9":      "https://download.rockylinux.org/pub/rocky/9/images/{0}/Rocky-9-GenericCloud-Base-9.4-20240609.1.{0}.qcow2",
         "latest": "9"
     }
 
-    ALMA_URL_PREFIX = "https://ftp.linux.cz/pub/linux/almalinux/{0}/cloud/{1}/images/"
+    ALMA_URL_PREFIX = "https://repo.almalinux.org/almalinux/{0}/cloud/{1}/images/"
     ALMA_VERSIONS = {
-        "8":      "https://ftp.sh.cvut.cz/almalinux/8/cloud/{0}/images/AlmaLinux-8-GenericCloud-8.7-20221111.{0}.qcow2",
-        "9":      "https://ftp.sh.cvut.cz/almalinux/9/cloud/{0}/images/AlmaLinux-9-GenericCloud-9.1-20221118.{0}.qcow2",
+        "8":      "https://repo.almalinux.org/almalinux/8/cloud/{0}/images/AlmaLinux-8-GenericCloud-8.10-20240530.{0}.qcow2",
+        "9":      "https://repo.almalinux.org/almalinux/9/cloud/{0}/images/AlmaLinux-9-GenericCloud-9.4-20240507.{0}.qcow2",
         "latest": "9"
     }
 
+    # https://yum.oracle.com/oracle-linux-templates.html
     ORACLE_VERSIONS = {
-        "7":      "https://yum.oracle.com/templates/OracleLinux/OL7/u9/x86_64/OL7U9_x86_64-kvm-b145.qcow",
-        "8":      "https://yum.oracle.com/templates/OracleLinux/OL8/u7/x86_64/OL8U7_x86_64-kvm-b148.qcow",
-        "9":      "https://yum.oracle.com/templates/OracleLinux/OL9/u1/x86_64/OL9U1_x86_64-kvm-b158.qcow",
+        "7":      "https://yum.oracle.com/templates/OracleLinux/OL7/u9/x86_64/OL7U9_x86_64-kvm-b218.qcow2",
+        "8":      "https://yum.oracle.com/templates/OracleLinux/OL8/u10/x86_64/OL8U10_x86_64-kvm-b237.qcow2",
+        "9":      "https://yum.oracle.com/templates/OracleLinux/OL9/u4/x86_64/OL9U4_x86_64-kvm-b234.qcow2",
         "latest": "9"
     }
 
     ORACLE_A64_VERSIONS = {
-        "8":      "https://yum.oracle.com/templates/OracleLinux/OL8/u7/aarch64/OL8U7_aarch64-kvm-cloud-b11.qcow",
-        "9":      "https://yum.oracle.com/templates/OracleLinux/OL9/u1/aarch64/OL9U1_aarch64-kvm-cloud-b14.qcow",
+        "8":      "https://yum.oracle.com/templates/OracleLinux/OL8/u10/aarch64/OL8U10_aarch64-kvm-cloud-b100.qcow2",
+        "9":      "https://yum.oracle.com/templates/OracleLinux/OL9/u4/aarch64/OL9U4_aarch64-kvm-cloud-b90.qcow2",
         "latest": "9"
     }
 
-    DEBIAN_RELEASE_MAP = {"10": "buster","11": "bullseye"}
-    DEBIAN_LATEST = "11"
+    DEBIAN_RELEASE_MAP = {"10": "buster","11": "bullseye", "12": "bookworm"}
+    DEBIAN_LATEST = "12"
     DEBIAN_IMG_URL = "https://cloud.debian.org/images/cloud/%s/daily/latest/debian-%s-genericcloud-%s-daily.qcow2"
 
     UBUNTU_RELEASES_API = "https://api.launchpad.net/devel/ubuntu/series"
-    UBUNTU_IMG_URL = "https://cloud-images.ubuntu.com/%s/current/%s-server-cloudimg-%s-disk-kvm.img"
+    UBUNTU_IMG_URL = "https://cloud-images.ubuntu.com/%s/current/%s-server-cloudimg-%s.img"
 
     def merge_object(self, obj):
         '''Overwrites default values with values from a python object which have

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/distro_utils/centos.py

@@ -24,8 +24,12 @@ def _get_centos_image_url(version:str, stream:bool, arch:str) -> str:
         if version == "latest":
             version = config_data.CENTOS_STREAM_VERSIONS["latest"]
 
+        # TODO: Until CentOS 10 starts syncing to the main mirror
+        if version == "10":
+            STREAM_URL_PREFIX = "https://odcs.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/BaseOS/{0}/images/".format(arch)
         # Try to dynamically get the latest at first
-        STREAM_URL_PREFIX = config_data.CENTOS_STREAM_URL_PREFIX.format(version, arch)
+        else:
+            STREAM_URL_PREFIX = config_data.CENTOS_STREAM_URL_PREFIX.format(version, arch)
         IMG_NAME = r'CentOS-Stream-GenericCloud-{0}-[0-9.]+.{1}.qcow2'.format(version, arch)
         try:
             return parse_latest_qcow(IMG_NAME, STREAM_URL_PREFIX)

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/distro_utils/fedora.py

@@ -9,6 +9,7 @@ import requests
 
 from testcloud import config
 from testcloud import exceptions
+from testcloud.distro_utils.misc import get_requests_session
 
 log = logging.getLogger('testcloud.util')
 config_data = config.get_config()
@@ -17,6 +18,8 @@ def _process_coreos_url(version:str, arch:str, platform:str) -> str:
     """
     Returns an CoreOS url in either qemu or openstack format
     """
+    session = get_requests_session()
+
     if version == "latest":
         version = "stable"
     if version not in config_data.STREAM_LIST:
@@ -26,7 +29,7 @@ def _process_coreos_url(version:str, arch:str, platform:str) -> str:
         log.error("Invalid platform ( %s ) requested for Fedora CoreOS." % platform)
         raise exceptions.TestcloudImageError
     try:
-        result = requests.get("https://builds.coreos.fedoraproject.org/streams/%s.json"%version).json()
+        result = session.get("https://builds.coreos.fedoraproject.org/streams/%s.json"%version).json()
     except (ConnectionError, IndexError, requests.exceptions.JSONDecodeError):
             log.error("Failed to fetch the image.")
             raise exceptions.TestcloudImageError
@@ -57,10 +60,12 @@ def get_fedora_image_url(version:str, arch:str) -> str:
     primary_arches = ["x86_64", "aarch64"]
     url = ""
 
+    session = get_requests_session()
+
     # get coreos url
     if version in config_data.STREAM_LIST:
         try:
-            result = requests.get("https://builds.coreos.fedoraproject.org/streams/%s.json"%version).json()
+            result = session.get("https://builds.coreos.fedoraproject.org/streams/%s.json"%version).json()
         except (ConnectionError, IndexError, requests.exceptions.JSONDecodeError):
               log.error("Failed to fetch the image.")
               raise exceptions.TestcloudImageError
@@ -69,7 +74,7 @@ def get_fedora_image_url(version:str, arch:str) -> str:
 
     #get Fedora Cloud url
     try:
-        oraculum_releases = requests.get('https://packager-dashboard.fedoraproject.org/api/v1/releases').json()
+        oraculum_releases = session.get('https://packager-dashboard.fedoraproject.org/api/v1/releases').json()
     except (ConnectionError, IndexError, requests.exceptions.JSONDecodeError):
         log.error("Couldn't fetch Fedora releases from oraculum...")
         raise exceptions.TestcloudImageError
@@ -89,6 +94,7 @@ def get_fedora_image_url(version:str, arch:str) -> str:
             log.error("non-x86_64 architecture is not supported with Fedora qa-matrix.")
             raise exceptions.TestcloudImageError
         try:
+            # Never cache this one
             nominated_response = requests.get("https://fedoraproject.org/wiki/Test_Results:Current_Installation_Test")
             return str(re.findall(r'href=\"(.*.%s.qcow2)\"' % arch, nominated_response.text)[0])
         except (ConnectionError, IndexError):
@@ -98,7 +104,7 @@ def get_fedora_image_url(version:str, arch:str) -> str:
     if version == "rawhide" or version == "branched":
         stamp = 0
         try:
-            releases = requests.get('https://openqa.fedoraproject.org/nightlies.json').json()
+            releases = session.get('https://openqa.fedoraproject.org/nightlies.json').json()
         except (ConnectionError, IndexError, requests.exceptions.JSONDecodeError):
             log.error("Failed to fetch the image.")
             raise exceptions.TestcloudImageError
@@ -116,14 +122,14 @@ def get_fedora_image_url(version:str, arch:str) -> str:
         version = str(oraculum_releases["fedora"]["stable"])
 
     try:
-        releases = requests.get('https://getfedora.org/releases.json').json()
+        releases = session.get('https://getfedora.org/releases.json').json()
     except (ConnectionError, requests.exceptions.JSONDecodeError):
         log.error("Couldn't fetch Fedora releases list...")
         raise exceptions.TestcloudImageError
 
     url = ""
     for release in releases:
-        if release["version"] == version and release["variant"] == "Cloud" and release["link"].endswith(".qcow2"):
+        if release["version"] == version and release["subvariant"] == "Cloud_Base" and release["link"].endswith(".qcow2"):
             # There are links only to primary architecutres in releases.json... much fun
             if arch in primary_arches and release["arch"] == arch:
                 url = release["link"]

testcloud-0.9.13/testcloud/distro_utils/misc.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Copyright 2023, Red Hat, Inc.
+# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
+# See the LICENSE file for more details on Licensing
+
+import logging
+import re
+import requests
+
+from testcloud import exceptions, config
+from packaging.version import Version
+
+config_data = config.get_config()
+log = logging.getLogger('testcloud.util')
+
+def parse_latest_qcow(rule:str, url:str) -> str:
+    session = get_requests_session()
+
+    try:
+        resp = session.get(url)
+        resp.raise_for_status()
+        latest_img_name = sorted(re.findall(rule, resp.text))[-1] or exceptions.TestcloudImageError
+        return url + str(latest_img_name)
+    except:
+        raise exceptions.TestcloudImageError
+
+
+def get_requests_session():
+    try:
+        assert config_data.CACHE_IMAGES
+        import requests_cache
+        assert Version(requests_cache.__version__) >= Version("1.2")
+
+        log.debug("Using local image url cache...")
+        return requests_cache.CachedSession(
+            cache_name="{}/testcloud_image_resolve_cache".format(config_data.DATA_DIR),
+            backend="sqlite",
+            stale_if_error=True,
+            expire_after=config_data.TRUST_DEADLINE * 60 * 60 * 24
+        )
+    except (ImportError, AssertionError):
+        log.debug("Not using local image url cache due to config or unmet dependencies...")
+        return requests.Session()

{testcloud-0.9.11 → testcloud-0.9.13}/testcloud/distro_utils/ubuntu.py

@@ -8,13 +8,16 @@ import requests
 
 from testcloud import config
 from testcloud import exceptions
+from testcloud.distro_utils.misc import get_requests_session
 
 log = logging.getLogger('testcloud.util')
 config_data = config.get_config()
 
 def get_ubuntu_releases() -> dict:
+    session = get_requests_session()
+
     try:
-        releases_resp = requests.get(config_data.UBUNTU_RELEASES_API).json()
+        releases_resp = session.get(config_data.UBUNTU_RELEASES_API).json()
     except (ConnectionError, IndexError, requests.exceptions.JSONDecodeError):
         log.error("Failed to fetch Ubuntu releases list.")
         raise exceptions.TestcloudImageError
@@ -32,8 +35,6 @@ def get_ubuntu_image_url(version:str, arch:str) -> str:
         log.error("Requested architecture is not supported by testcloud for Ubuntu.")
         raise exceptions.TestcloudImageError
 
-    if arch != "x86_64":
-        config_data.UBUNTU_IMG_URL = config_data.UBUNTU_IMG_URL.replace("-disk-kvm.img", ".img")
     releases = get_ubuntu_releases()
     if len(releases) == 0:
         raise exceptions.TestcloudImageError