gryf/boxpy
1
0
Fork 0
mirror of https://github.com/gryf/boxpy.git synced 2025-12-19 05:30:18 +01:00
Code Issues Projects Releases Wiki Activity

Keep image information right in the appropriate image subclass.

Browse Source
This commit is contained in:
gryf
2024-04-30 15:13:01 +02:00
parent 3d840de3ee
commit 86b02fca1b
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
box.py
View File

@@ -22,9 +22,6 @@ __version__ = "1.9.2"
CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache')) CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
CLOUD_IMAGE = "ci.iso" CLOUD_IMAGE = "ci.iso"
FEDORA_RELEASE_MAP = {'37': '1.7', '38': '1.6', '39': '1.5', '40': '1.14'}
DEBIAN_CODENAME_MAP = {'13': 'trixie', '12': 'bookworm', '11': 'bullseye',
'10': 'buster'}
TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'} TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'}
DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora', DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora',
'centos': 'Centos Stream', 'debian': 'Debian'} 'centos': 'Centos Stream', 'debian': 'Debian'}
@@ -985,7 +982,7 @@ class Image:
IMG = "" IMG = ""
CHECKSUMTOOL = 'sha256sum' CHECKSUMTOOL = 'sha256sum'
def __init__(self, vbox, version, arch, release, fname=None): def __init__(self, vbox, version, arch, fname=None):
self.vbox = vbox self.vbox = vbox
self._tmp = tempfile.mkdtemp(prefix='boxpy_') self._tmp = tempfile.mkdtemp(prefix='boxpy_')
self._img_fname = fname self._img_fname = fname
@@ -1067,8 +1064,8 @@ class Ubuntu(Image):
URL = "https://cloud-images.ubuntu.com/releases/%s/release/%s" URL = "https://cloud-images.ubuntu.com/releases/%s/release/%s"
IMG = "ubuntu-%s-server-cloudimg-%s.img" IMG = "ubuntu-%s-server-cloudimg-%s.img"
def __init__(self, vbox, version, arch, release, fname=None): def __init__(self, vbox, version, arch, fname=None):
super().__init__(vbox, version, arch, release) super().__init__(vbox, version, arch)
self._img_fname = self.IMG % (version, arch) self._img_fname = self.IMG % (version, arch)
self._img_url = self.URL % (version, self._img_fname) self._img_url = self.URL % (version, self._img_fname)
self._checksum_file = 'SHA256SUMS' self._checksum_file = 'SHA256SUMS'
@@ -1090,13 +1087,18 @@ class Debian(Image):
URL = "https://cloud.debian.org/images/cloud/%s/daily/latest/%s" URL = "https://cloud.debian.org/images/cloud/%s/daily/latest/%s"
IMG = "debian-%s-generic-%s-daily.qcow2" IMG = "debian-%s-generic-%s-daily.qcow2"
CHECKSUMTOOL = 'sha512sum' CHECKSUMTOOL = 'sha512sum'
CODENAME_MAP = {'13': 'trixie',
'12': 'bookworm',
'11': 'bullseye',
'10': 'buster'}
def __init__(self, vbox, version, arch, release, fname=None): def __init__(self, vbox, version, arch, fname=None):
super().__init__(vbox, version, arch, release) super().__init__(vbox, version, arch)
codename = self.CODENAME_MAP[version]
self._img_fname = self.IMG % (version, arch) self._img_fname = self.IMG % (version, arch)
self._img_url = self.URL % (release, self._img_fname) self._img_url = self.URL % (codename, self._img_fname)
self._checksum_file = 'SHA512SUMS' self._checksum_file = 'SHA512SUMS'
self._checksum_url = self.URL % (release, self._checksum_file) self._checksum_url = self.URL % (codename, self._checksum_file)
def _get_checksum(self, fname): def _get_checksum(self, fname):
expected_sum = None expected_sum = None
@@ -1115,16 +1117,21 @@ class Fedora(Image):
"Cloud/%s/images/%s") "Cloud/%s/images/%s")
IMG = "Fedora-Cloud-Base-%s-%s.%s.qcow2" IMG = "Fedora-Cloud-Base-%s-%s.%s.qcow2"
CHKS = "Fedora-Cloud-%s-%s-%s-CHECKSUM" CHKS = "Fedora-Cloud-%s-%s-%s-CHECKSUM"
REVISION = {'37': '1.7',
'38': '1.6',
'39': '1.5',
'40': '1.14'}
def __init__(self, vbox, version, arch, release, fname=None): def __init__(self, vbox, version, arch, fname=None):
super().__init__(vbox, version, arch, release) super().__init__(vbox, version, arch)
revision = self.REVISION[version]
if int(version) > 39: if int(version) > 39:
self.IMG = "Fedora-Cloud-Base-Generic.%s-%s-%s.qcow2" self.IMG = "Fedora-Cloud-Base-Generic.%s-%s-%s.qcow2"
self._img_fname = self.IMG % (arch, version, release) self._img_fname = self.IMG % (arch, version, revision)
else: else:
self._img_fname = self.IMG % (version, release, arch) self._img_fname = self.IMG % (version, revision, arch)
self._img_url = self.URL % (version, arch, self._img_fname) self._img_url = self.URL % (version, arch, self._img_fname)
self._checksum_file = self.CHKS % (version, release, arch) self._checksum_file = self.CHKS % (version, revision, arch)
self._checksum_url = self.URL % (version, arch, self._checksum_file) self._checksum_url = self.URL % (version, arch, self._checksum_file)
def _get_checksum(self, fname): def _get_checksum(self, fname):
@@ -1221,13 +1228,8 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
def get_image_object(vbox, version, image='ubuntu', arch='amd64'): def get_image_object(vbox, version, image='ubuntu', arch='amd64'):
release = None
if image == 'fedora':
release = FEDORA_RELEASE_MAP[version]
if image == 'debian':
release = DEBIAN_CODENAME_MAP[version]
return DISTROS[image]['img_class'](vbox, version, DISTROS[image]['amd64'], return DISTROS[image]['img_class'](vbox, version, DISTROS[image]['amd64'],
release, DISTROS[image].get('image')) DISTROS[image].get('image'))
class IsoImage: class IsoImage: