Added poweroff option for stopping machine

Bump the version.
Also, clean up raising exceptions.
2026-02-01 21:45:46 +01:00 · 2024-05-14 19:30:56 +02:00 · 2024-04-30 15:14:39 +02:00 · 2024-04-30 15:14:13 +02:00 · 2024-04-30 15:10:03 +02:00 · 2024-03-30 20:34:01 +01:00
9 changed files with 280 additions and 117 deletions
--- a/README.rst
+++ b/README.rst
@@ -29,25 +29,55 @@ Requirements
  formats


+Tested distros
+--------------
+
+- Ubuntu
+  - 18.04
+  - 20.04
+  - 22.04
+  - 24.04
+- Fedora
+  - 37
+  - 38
+  - 39
+  - 40
+- Centos Stream
+  - 8
+  - 9
+- Debian
+  - 10 (buster)
+  - 11 (bullseye)
+  - 12 (bookworm)
+  - 13 (trixie) - prerelease
+
+There is possibility to use whatever OS image which supports cloud-init. Use
+the ``--image`` param for ``create`` command to pass image filename, although
+it's wise to at least discover (or not, but it may be easier in certain
+distributions) what username is supposed to be used as a default user and pass
+it with ``--username`` param.
+
+
 How to run it
 -------------

 First, make sure you fulfill the requirements; either by using packages from
-your operating system, or by using virtualenv for Python requirements, i.e.:
+your operating system, or by using virtualenv, i.e.:

 .. code:: shell-session

   $ python -m virtualenv .venv
   $ . .venv/bin/activate
-   (.venv) $ pip install -r requirements.txt
+   (.venv) $ pip install .

-then you can issue:
+You'll have ``boxpy`` command created for you as well.

 .. code:: shell-session

-   $ alias boxpy='python /path/to/box.py'
+   $ boxpy -V
+   boxpy 1.9.2

-or simply link it somewhere in the path:
+Other option is simply link it somewhere in the path:

 .. code:: shell-session

@@ -55,25 +85,25 @@ or simply link it somewhere in the path:
   $ chmod +x ~/bin/boxpy

 and now you can issue some command. For example, to spin up a VM with Ubuntu
-18.04 with one CPU, 1GB of memory and 6GB of disk:
+20.04 with one CPU, 1GB of memory and 6GB of disk:

 .. code:: shell-session

-   $ boxpy create --version 18.04 myvm
+   $ boxpy create --version 20.04 myvm

 note, that Ubuntu is default distribution you don't need to specify
 ``--distro`` nor ``--version`` it will pick up latest LTS version. Now, let's
-recreate it with 20.04:
+recreate it with 22.04:

 .. code:: shell-session

-   $ boxpy rebuild --version 20.04 myvm
+   $ boxpy rebuild --version 22.04 myvm

 or recreate it with Fedora and add additional CPU:

 .. code:: shell-session

-   $ boxpy rebuild --distro fedora --version 34 --cpu 2 myvm
+   $ boxpy rebuild --distro fedora --version 39 --cpu 2 myvm

 now, let's connect to the VM using either ssh command, which is printed out at
 as last ``boxpy`` output line, or simply by using ssh boxpy command:
--- a/box.py
+++ b/box.py
@@ -18,12 +18,10 @@ import requests
 import yaml


-__version__ = "1.3"
+__version__ = "1.10.1"

 CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
 CLOUD_IMAGE = "ci.iso"
-FEDORA_RELEASE_MAP = {'32': '1.6', '33': '1.2', '34': '1.2'}
-DEBIAN_CODENAME_MAP = {'12': 'bookworm', '11': 'bullseye', '10': 'buster'}
 TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'}
 DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora',
              'centos': 'Centos Stream', 'debian': 'Debian'}
@@ -137,13 +135,37 @@ _boxpy() {
            if [[ ${prev} == ${cmd} ]]; then
                COMPREPLY=( $(compgen -W "bash" -- ${cur}) )
            fi
+            ;;
+        start)
+            items=(--type)
+            if [[ ${prev} == ${cmd} ]]; then
+                if [[ ${cmd} = "start" ]]; then
+                    _vms_comp vms
+                else
+                    COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
+                fi
+            else
+                _get_excluded_items "${items[@]}"
+                COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
+
+                case "${prev}" in
+                    --type)
+                        COMPREPLY=( $(compgen -W "gui headless sdl separate" \
+                            -- ${cur}) )
+                        ;;
+                    --*)
+                        COMPREPLY=( )
+                        ;;
+                esac
+            fi
+
            ;;
        create|rebuild)
            items=(--cpus --disable-nested --disk-size --default-user --distro
                --forwarding --image --key --memory --hostname --port --config
                --version --type)
            if [[ ${prev} == ${cmd} ]]; then
-                if [[ ${cmd} = "rebuild" ]]; then
+                if [[ ${cmd} = "rebuild" || ${cmd} == "start" ]]; then
                    _vms_comp vms
                else
                    COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
@@ -195,14 +217,23 @@ _boxpy() {
                _vms_comp runningvms
            fi
            ;;
-        start)
-            if [[ ${prev} == ${cmd} ]]; then
-                _vms_comp vms
-            fi
-            ;;
        stop)
+            items=(--poweroff)
            if [[ ${prev} == ${cmd} ]]; then
-                _vms_comp runningvms
+                if [[ ${cmd} = "stop" ]]; then
+                    _vms_comp runningvms
+                else
+                    COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
+                fi
+            else
+                _get_excluded_items "${items[@]}"
+                COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
+
+                case "${prev}" in
+                    --*)
+                        COMPREPLY=( )
+                        ;;
+                esac
            fi
            ;;
    esac
@@ -587,14 +618,47 @@ class Config:


 class OsTypes:
-    def ubuntu(conf):
-        return "Ubuntu%s_64" % conf.version.replace('.', '_')
+    def __init__(self, conf):
+        self._conf = conf
+        self._ostypes = []

-    def fedora(conf):
+        self._gather_os_types()
+
+    def _gather_os_types(self):
+        out = Run(['vboxmanage', 'list', 'ostypes']).stdout
+        for line in out.split('\n'):
+            if not line.startswith('ID:'):
+                continue
+            self._ostypes.append(line.split(':')[1].strip())
+
+    def ubuntu(self):
+        lts = ''
+        major, minor = [int(x) for x in self._conf.version.split('.')]
+
+        if major % 2 == 0 and minor == 4:
+            lts = '_LTS'
+        name = "Ubuntu%s%s_64" % (major, lts)
+
+        if name not in self._ostypes:
+            return 'Ubuntu_64'
+
+        return name
+
+    def fedora(self):
        return "Fedora_64"

-    def debian(conf):
-        return "Debian%s_64" % conf.version
+    def debian(self):
+        name = "Debian%s_64" % self._conf.version
+        if name not in self._ostypes:
+            return 'Debian_64'
+
+        return name
+
+    def get(self):
+        if not hasattr(self, self._conf.distro):
+            return "Linux_64"
+
+        return getattr(self, self._conf.distro)()


 class VBoxManage:
@@ -623,7 +687,7 @@ class VBoxManage:
        dom = xml.dom.minidom.parse(path)
        if len(dom.getElementsByTagName('HardDisk')) != 1:
            # don't know what to do with multiple discs
-            raise BoxError()
+            raise BoxError

        disk = dom.getElementsByTagName('HardDisk')[0]
        location = disk.getAttribute('location')
@@ -766,7 +830,8 @@ class VBoxManage:
                self.uuid = line.split('UUID:')[1].strip()

        if not self.uuid:
-            raise BoxVBoxFailure(f'Cannot create VM "{self.name_or_uuid}".')
+            msg = f'Cannot create VM "{self.name_or_uuid}".'
+            raise BoxVBoxFailure(msg)

        port = conf.port if conf.port else self._find_unused_port()

@@ -779,12 +844,8 @@ class VBoxManage:
               '--nic1', 'nat',
               '--natpf1', f'boxpyssh,tcp,,{port},,22',
               '--graphicscontroller', 'vmsvga',
-               '--vram', '16']
-
-        if hasattr(OsTypes, conf.distro):
-            cmd.extend(['--ostype', getattr(OsTypes, conf.distro)(conf)])
-        else:
-            cmd.extend(['--ostype', 'Linux_64'])
+               '--vram', '16',
+               '--ostype', OsTypes(conf).get()]

        for count, (hostport, vmport) in enumerate(conf.forwarding.items(),
                                                   start=1):
@@ -793,14 +854,14 @@ class VBoxManage:

        if Run(cmd).returncode != 0:
            LOG.fatal(f'Cannot modify VM "{self.name_or_uuid}"')
-            raise BoxVBoxFailure()
+            raise BoxVBoxFailure

        if conf.disable_nested == 'False':
            if Run(['vboxmanage', 'modifyvm', self.name_or_uuid,
                    '--nested-hw-virt', 'on']).returncode != 0:
                LOG.fatal(f'Cannot set nested virtualization for VM '
                          f'"{self.name_or_uuid}"')
-                raise BoxVBoxFailure()
+                raise BoxVBoxFailure

        return self.uuid

@@ -836,7 +897,7 @@ class VBoxManage:
        if Run(['vboxmanage', 'modifymedium', 'disk', src, '--resize',
                str(size), '--move', fullpath]).returncode != 0:
            LOG.fatal('Resizing and moving image %s has failed', dst)
-            raise BoxVBoxFailure()
+            raise BoxVBoxFailure
        return fullpath

    def storageattach(self, controller_name, port, type_, image):
@@ -860,7 +921,7 @@ class VBoxManage:
        if Run(['vboxmanage', 'startvm', self.name_or_uuid, '--type',
                type_]).returncode != 0:
            LOG.fatal('Failed to start: %s', self.name_or_uuid)
-            raise BoxVBoxFailure()
+            raise BoxVBoxFailure

    def setextradata(self, key, val):
        res = Run(['vboxmanage', 'setextradata', self.name_or_uuid, key, val])
@@ -874,7 +935,7 @@ class VBoxManage:
        if Run(['vboxmanage', 'modifyvm', self.name_or_uuid, f'--{nic}',
                kind]).returncode != 0:
            LOG.fatal('Cannot modify VM "%s"', self.name_or_uuid)
-            raise BoxVBoxFailure()
+            raise BoxVBoxFailure

    def is_port_in_use(self, port):
        used_ports = self._get_defined_ports()
@@ -936,7 +997,7 @@ class Image:
    IMG = ""
    CHECKSUMTOOL = 'sha256sum'

-    def __init__(self, vbox, version, arch, release, fname=None):
+    def __init__(self, vbox, version, arch, fname=None):
        self.vbox = vbox
        self._tmp = tempfile.mkdtemp(prefix='boxpy_')
        self._img_fname = fname
@@ -999,8 +1060,7 @@ class Image:
            return True

        fname = os.path.join(CACHE_DIR, self._img_fname)
-        LOG.header('Downloading image %s from %s', self._img_fname,
-                   self._img_url)
+        LOG.header('Downloading image %s', self._img_url)
        Run(['wget', '-q', self._img_url, '-O', fname])

        if not self._checksum():
@@ -1012,15 +1072,15 @@ class Image:
        return True

    def _get_checksum(self, fname):
-        raise NotImplementedError()
+        raise NotImplementedError


 class Ubuntu(Image):
    URL = "https://cloud-images.ubuntu.com/releases/%s/release/%s"
    IMG = "ubuntu-%s-server-cloudimg-%s.img"

-    def __init__(self, vbox, version, arch, release, fname=None):
-        super().__init__(vbox, version, arch, release)
+    def __init__(self, vbox, version, arch, fname=None):
+        super().__init__(vbox, version, arch)
        self._img_fname = self.IMG % (version, arch)
        self._img_url = self.URL % (version, self._img_fname)
        self._checksum_file = 'SHA256SUMS'
@@ -1042,13 +1102,18 @@ class Debian(Image):
    URL = "https://cloud.debian.org/images/cloud/%s/daily/latest/%s"
    IMG = "debian-%s-generic-%s-daily.qcow2"
    CHECKSUMTOOL = 'sha512sum'
+    CODENAME_MAP = {'13': 'trixie',
+                    '12': 'bookworm',
+                    '11': 'bullseye',
+                    '10': 'buster'}

-    def __init__(self, vbox, version, arch, release, fname=None):
-        super().__init__(vbox, version, arch, release)
+    def __init__(self, vbox, version, arch, fname=None):
+        super().__init__(vbox, version, arch)
+        codename = self.CODENAME_MAP[version]
        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_url = self.URL % (release, self._checksum_file)
+        self._checksum_url = self.URL % (codename, self._checksum_file)

    def _get_checksum(self, fname):
        expected_sum = None
@@ -1067,12 +1132,21 @@ class Fedora(Image):
           "Cloud/%s/images/%s")
    IMG = "Fedora-Cloud-Base-%s-%s.%s.qcow2"
    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):
-        super().__init__(vbox, version, arch, release)
-        self._img_fname = self.IMG % (version, release, arch)
+    def __init__(self, vbox, version, arch, fname=None):
+        super().__init__(vbox, version, arch)
+        revision = self.REVISION[version]
+        if int(version) > 39:
+            self.IMG = "Fedora-Cloud-Base-Generic.%s-%s-%s.qcow2"
+            self._img_fname = self.IMG % (arch, version, revision)
+        else:
+            self._img_fname = self.IMG % (version, revision, arch)
        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)

    def _get_checksum(self, fname):
@@ -1150,32 +1224,27 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
                      'realname': 'ubuntu',
                      'img_class': Ubuntu,
                      'amd64': 'amd64',
-                      'default_version': '22.04'},
+                      'default_version': '24.04'},
           'fedora': {'username': 'fedora',
                      'realname': 'fedora',
                      'img_class': Fedora,
                      'amd64': 'x86_64',
-                      'default_version': '34'},
+                      'default_version': '40'},
           'centos': {'username': 'centos',
                      'realname': 'centos',
                      'img_class': CentosStream,
                      'amd64': 'x86_64',
-                      'default_version': '8'},
+                      'default_version': '9'},
           'debian': {'username': 'debian',
                      'realname': 'debian',
                      'img_class': Debian,
                      'amd64': 'amd64',
-                      'default_version': '11'}}
+                      'default_version': '12'}}


 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'],
-                                       release, DISTROS[image].get('image'))
+                                       DISTROS[image].get('image'))


 class IsoImage:
@@ -1320,11 +1389,18 @@ def vmcreate(args, conf=None):
                                          f'Check output in debug mode.')
                time.sleep(3)
                counter += 1
-                if counter == 8 and conf.distro == 'debian':
+
+                # TODO: there is something odd with debian cloud images prior
+                # to 12 (bookworm), as on first run system crashes. In that
+                # case after ~20 seconds there should already be panic, reset
+                # machine as a workaround. Remove this after debian 12
+                # stabilization later this year.
+                if (counter == 8 and conf.distro == 'debian'
+                        and conf.version != '12'):
+                    LOG.debug('Resetting `%s`, due to the issue with kernel '
+                              'panic on Debian %s the first run', conf.name,
+                              conf.version)
                    counter += 1
-                    # there is something odd with debian cloud images, as they
-                    # segfault on first run. after ~20 seconds there should
-                    # already be panic, reset machine should help
                    vbox.poweroff()
                    time.sleep(3)
                    vbox.poweron(args.type)
@@ -1549,7 +1625,7 @@ def connect(args):
    return Run(cmd, False).returncode


-def _set_vmstate(name, state):
+def _set_vmstate(name, state, guitype=None, poweroff=False):

    vbox = VBoxManage(name)
    if not vbox.get_vm_info():
@@ -1565,17 +1641,19 @@ def _set_vmstate(name, state):
        return

    if state == "start":
-        vbox.poweron()
+        vbox.poweron(guitype)
+    elif poweroff:
+        vbox.poweroff()
    else:
        vbox.acpipowerbutton()


 def vmstart(args):
-    _set_vmstate(args.name, 'start')
+    _set_vmstate(args.name, 'start', guitype=args.type)


 def vmstop(args):
-    _set_vmstate(args.name, 'stop')
+    _set_vmstate(args.name, 'stop', poweroff=args.poweroff)


 def main():
@@ -1686,10 +1764,15 @@ def main():

    start = subparsers.add_parser('start', help='start VM')
    start.add_argument('name', help='name or UUID of the VM')
+    start.add_argument('-t', '--type', default='headless',
+                       help="VM run type, headless by default.",
+                       choices=['gui', 'headless', 'sdl', 'separate'])
    start.set_defaults(func=vmstart)

    stop = subparsers.add_parser('stop', help='stop VM')
    stop.add_argument('name', help='name or UUID of the VM')
+    stop.add_argument('-p', '--poweroff', action='store_true', help='poweroff '
+                      'machine instead of using ACPI power signal')
    stop.set_defaults(func=vmstop)

    completion = subparsers.add_parser('completion', help='generate shell '
--- a/examples/devstack-fedora36.yaml
+++ b/examples/devstack-fedora36.yaml
@@ -1,9 +1,7 @@
-# Note, that cloud init will fail, due to old cloudinit package, which module
-# cc_keys_to_console doesn't recognize skipping option. Just ignore this error.
 package_update: true
 packages:
  - bash-completion
-  - ctags-etags
+  - ctags
  - git
  - git-review
  - htop
@@ -25,13 +23,13 @@ write_files:
      disable_service n-vnc
      disable_service dstat
 runcmd:
-  - [su, -, fedora, -c, "git clone https://opendev.org/openstack/devstack ~/devstack"]
-  - [su, -, fedora, -c, "cp /tmp/local.conf /home/fedora/devstack/"]
-  - [su, -, fedora, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
+  - su - fedora -c "git clone https://opendev.org/openstack/devstack ~/devstack"
+  - su - fedora -c "cp /tmp/local.conf /home/fedora/devstack/"
+  - su - fedora -c "echo 'export HOST_IP=10.0.2.15' >> .bashrc"
 boxpy_data:
  key: vm
  cpus: 2
  memory: 4GB
  disk_size: 10GB
  distro: fedora
-  version: 34
+  version: 36
--- a/examples/devstack-ubuntu-22.04.yaml
+++ b/examples/devstack-ubuntu-22.04.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -26,17 +26,15 @@ write_files:
      RABBIT_PASSWORD=$$ADMIN_PASSWORD
      SERVICE_PASSWORD=$$ADMIN_PASSWORD
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack ~/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=10.0.2.15' >> .bashrc"
 boxpy_data:
  key: vm
  cpus: 2
  memory: 6GB
  disk_size: 10GB
  distro: ubuntu
-  version: 20.04
+  version: 22.04
--- a/examples/kuryr_multinode_master.yaml
+++ b/examples/kuryr_multinode_master.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -122,6 +122,7 @@ write_files:

      # Vars
      ADMIN_PASSWORD="secretadmin"
+      CONTAINER_ENGINE="crio"
      DATABASE_PASSWORD="secretdatabase"
      ETCD_USE_RAMDISK="True"

@@ -131,9 +132,10 @@ write_files:
      KURYR_K8S_MULTI_WORKER_TESTS="True"
      KURYR_K8S_OCTAVIA_MEMBER_MODE="L2"
      KURYR_LB_ALGORITHM="SOURCE_IP_PORT"
-      KURYR_NEUTRON_DEFAULT_ROUTER="router1"
+      KURYR_NEUTRON_DEFAULT_ROUTER="kuryr-router"
      KURYR_SG_DRIVER="policy"
      KURYR_SUBNET_DRIVER="namespace"
+      KURYR_SUPPORT_POD_SECURITY="True"

      LOGFILE="/opt/stack/logs/devstacklog.txt"
      LOG_COLOR="False"
@@ -142,10 +144,11 @@ write_files:
      OCTAVIA_AMP_IMAGE_NAME="test-only-amphora-x64-haproxy-ubuntu-bionic"
      OCTAVIA_AMP_IMAGE_SIZE="3"

-      OVN_BRANCH="v20.06.2"
+      OVN_BRANCH="v21.06.0"
      OVN_BUILD_FROM_SOURCE="True"
      OVN_DBS_LOG_LEVEL="dbg"
      OVN_L3_CREATE_PUBLIC_NETWORK="True"
+      OVS_BRANCH="a4b04276ab5934d087669ff2d191a23931335c87"

      VAR_RUN_PATH="/usr/local/var/run"

@@ -167,23 +170,25 @@ write_files:
      enable_plugin octavia-tempest-plugin https://opendev.org/openstack/octavia-tempest-plugin
      enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider

-      [[post-config|$OCTAVIA_CONF]]
+      [[post-config|$$OCTAVIA_CONF]]
      [api_settings]
      enabled_provider_drivers = amphora:'Octavia Amphora driver',ovn:'Octavia OVN driver'
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.10' >> .bashrc"]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [systemctl, restart, systemd-networkd]
+  - systemctl stop systemd-resolved.service
+  - systemctl disable systemd-resolved.service
+  - echo "nameserver 1.1.1.1" > /etc/resolv.conf
+  - apt purge -y snapd
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=192.168.10.10' >> .bashrc"
+  - systemctl restart systemd-networkd
 boxpy_data:
  key: vm
  cpus: 4
  memory: 16GB
  disk_size: 50GB
+  version: 20.04
  advanced:
    nic2: intnet
-  version: 20.04
--- a/examples/kuryr_multinode_worker.yaml
+++ b/examples/kuryr_multinode_worker.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -79,6 +79,7 @@ write_files:

      # Vars
      ADMIN_PASSWORD="secretadmin"
+      CONTAINER_ENGINE="crio"
      DATABASE_HOST="192.168.10.10"
      DATABASE_PASSWORD="secretdatabase"
      ENABLE_CHASSIS_AS_GW="False"
@@ -89,7 +90,7 @@ write_files:
      KURYR_EP_DRIVER_OCTAVIA_PROVIDER="ovn"
      KURYR_K8S_OCTAVIA_MEMBER_MODE="L2"
      KURYR_LB_ALGORITHM="SOURCE_IP_PORT"
-      KURYR_NEUTRON_DEFAULT_ROUTER="router1"
+      KURYR_NEUTRON_DEFAULT_ROUTER="kuryr-router"
      VAR_RUN_PATH="/usr/local/var/run"

      KURYR_ENABLED_HANDLERS="vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer"
@@ -97,10 +98,11 @@ write_files:
      KURYR_SUBNET_DRIVER="namespace"


-      OVN_BRANCH="v20.06.2"
+      OVN_BRANCH="v21.06.0"
      OVN_BUILD_FROM_SOURCE="True"
      OVN_DBS_LOG_LEVEL="dbg"
      OVN_L3_CREATE_PUBLIC_NETWORK="True"
+      OVS_BRANCH="a4b04276ab5934d087669ff2d191a23931335c87"


      LIBVIRT_TYPE="qemu"
@@ -120,19 +122,21 @@ write_files:
      enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
      enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.11' >> .bashrc"]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [systemctl, restart, systemd-networkd]
+  - systemctl stop systemd-resolved.service
+  - systemctl disable systemd-resolved.service
+  - echo "nameserver 1.1.1.1" > /etc/resolv.conf
+  - apt purge -y snapd
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=192.168.10.11' >> .bashrc"
+  - systemctl restart systemd-networkd
 boxpy_data:
  key: vm
  cpus: 4
  memory: 16GB
  disk_size: 50GB
+  version: 20.04
  advanced:
    nic2: intnet
-  version: 20.04
--- a/examples/wmaker.yaml
+++ b/examples/wmaker.yaml
@@ -29,10 +29,10 @@ packages:
  - vim-nox
  - xinit
 runcmd:
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/wmaker -b experimental"]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
+  - su - ubuntu -c "git clone https://github.com/gryf/wmaker -b experimental"
+  - su - ubuntu -c "git clone https://github.com/gryf/vmstrap"
+  - su - ubuntu -c "vmstrap/bootstrap.sh -c"
+  - rm -fr /home/ubuntu/vmstrap
 boxpy_data:
  key: vm
  cpus: 4
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -0,0 +1,47 @@
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "boxpy"
+dynamic = ["version"]
+authors = [
+    {name = "Roman Dobosz", email = "gryf73@gmail.com"}
+]
+license = {text = "GPLv3"}
+description = "Run Linux cloud image on top of VirtualBox using commandline tool"
+readme = "README.rst"
+requires-python = ">=3.8"
+keywords = ["vboxmanage", "virtualbox", "vm", "virtual machine", "automation"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: End Users/Desktop",
+    "Topic :: Terminals",
+    "Topic :: Utilities",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3 :: Only"
+]
+dependencies = [
+    "pyyaml>=5.4.1",
+    "requests>=2.26.0"
+]
+
+[project.urls]
+Homepage = "https://github.com/gryf/boxpy"
+
+[project.scripts]
+boxpy = "box:main"
+
+[tool.setuptools]
+py-modules = ["box"]
+
+[tool.setuptools.dynamic]
+version = {attr = "box.__version__"}
+
+[tool.distutils.bdist_wheel]
+universal = true
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +0,0 @@
-pyyaml>=5.4.1
-requests>=2.26.0
Author	SHA1	Message	Date
gryf	62b86d5f81	Added poweroff option for stopping machine	2024-05-14 19:30:56 +02:00
gryf	14cd805e00	Bump the version. Also, clean up raising exceptions.	2024-04-30 15:14:39 +02:00
gryf	86b02fca1b	Keep image information right in the appropriate image subclass.	2024-04-30 15:14:13 +02:00
gryf	3d840de3ee	Bump Debian, Fedora and Ubuntu versions. Also, set Ubuntu latest LTS as default.	2024-04-30 15:10:03 +02:00
gryf	2a1a4cf40a	Use pyproject.toml for installing box module.	2024-03-30 20:34:01 +01:00
gryf	71bf5b6d99	Bump Fedora version, remove archived versions prior to 37	2023-12-05 11:54:05 +01:00
gryf	e73d5ce458	Update kuryr multinode setup example	2023-07-23 12:58:12 +02:00
gryf	d623114f69	Update example for wmaker	2023-07-23 12:54:09 +02:00
gryf	51f642bea0	Updated ubuntu devstack example	2023-07-23 12:39:18 +02:00
gryf	12df0e97df	Updated fedora devstack example	2023-07-23 11:53:59 +02:00
gryf	5f0def3103	Bump distribution latest version. Also, updated mapping for the Fedora images.	2023-07-05 15:58:56 +02:00
gryf	43eabb9947	Fix nasty bug for debian images	2023-07-04 18:48:18 +02:00
gryf	55416db13d	Added --type switch for start command	2023-04-20 19:42:21 +02:00
gryf	86a5655025	Improve detecting VM Operating System.	2023-04-20 19:21:24 +02:00
gryf	259d11e409	Don't reset Debian Bookworm on first run. Issue/glitch with kernel panic on first run seems to be fixed on Debian Bookworm (12). Do not reset VM for that version (and hopefully upcoming).	2023-04-20 17:01:57 +02:00