From f81b8cbe5b9c71fe250b0cc9e9f036bc08ce61e4 Mon Sep 17 00:00:00 2001
From: Guillaume Boutry <guillaume.boutry@canonical.com>
Date: Thu, 13 Feb 2025 09:11:48 +0100
Subject: [PATCH] Upgrade to 2024.1

Upgrade base from core22 to core24.
Upgrade to 2024.1.

Change-Id: I4345613aad77a3e8598a2875ec0e220de6583412
Signed-off-by: Guillaume Boutry <guillaume.boutry@canonical.com>
---
 snapcraft.yaml     | 11 +++--------
 tools/lxd_build.sh |  4 +++-
 tox.ini            |  5 +++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2d0b28d..aaaf9a4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: openstackclients
-version: zed
+version: "2024.1"
 summary: OpenStack Client tools
 description: |
   OpenStackClient (aka OSC) is a command-line client for OpenStack
@@ -14,7 +14,7 @@ description: |
   project specific command-line clients.
 confinement: strict
 grade: stable
-base: core22
+base: core24
 environment:
   REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
   PYTHONIOENCODING: utf-8
@@ -49,11 +49,6 @@ apps:
     plugs:
       - network
       - home
-  neutron:
-    command: bin/neutron
-    plugs:
-      - network
-      - home
   nova:
     command: bin/nova
     plugs:
@@ -180,7 +175,7 @@ parts:
       - setuptools-rust
       - Cython
     python-constraints:
-      - https://raw.githubusercontent.com/openstack/requirements/stable/zed/upper-constraints.txt
+      - https://raw.githubusercontent.com/openstack/requirements/stable/2024.1/upper-constraints.txt
     build-packages:
       - libffi-dev
       - libssl-dev
diff --git a/tools/lxd_build.sh b/tools/lxd_build.sh
index 41b7da1..646ef27 100755
--- a/tools/lxd_build.sh
+++ b/tools/lxd_build.sh
@@ -7,10 +7,12 @@ sudo apt update
 export PATH=/snap/bin:$PATH
 
 # Setup snapd and snapcraft
-sudo apt install -y snapd
+sudo apt install -y snapd nftables
 sudo snap install --classic snapcraft
 sudo snap install --classic lxd
 sudo lxd init --auto
 
+sudo nft insert rule filter openstack-INPUT iif lxdbr0 accept
+
 # Build our snap!
 sudo snapcraft --use-lxd
diff --git a/tox.ini b/tox.ini
index b375201..910e302 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,10 +7,11 @@ basepython = python3
 install_command = pip install {opts} {packages}
 setenv =
     PATH = /snap/bin:{env:PATH}
-passenv = HOME TERM
-whitelist_externals =
+passenv = HOME,TERM
+allowlist_externals =
     sudo
     /snap/bin/snapcraft
+    {toxinidir}/tools/lxd_build.sh
 
 [testenv:snap]
 deps = -r{toxinidir}/requirements.txt