From 2793a02884be5b7f9e1caf40a790fad51ac0db73 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Dec 2025 16:21:52 +0000 Subject: [PATCH] image: Move some code around This is referenced in multiple places. Place it before all of them. Change-Id: I1314b581848ecd146020c7d1743d2b9757493643 Signed-off-by: Stephen Finucane --- openstack/image/v2/_proxy.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/openstack/image/v2/_proxy.py b/openstack/image/v2/_proxy.py index 3a920204a..3dba409cb 100644 --- a/openstack/image/v2/_proxy.py +++ b/openstack/image/v2/_proxy.py @@ -113,6 +113,21 @@ class Proxy(proxy.Proxy): # ====== IMAGES ====== + def _make_v2_image_params(self, meta, properties): + ret: dict = {} + for k, v in iter(properties.items()): + if k in _INT_PROPERTIES: + ret[k] = int(v) + elif k in _RAW_PROPERTIES: + ret[k] = v + else: + if v is None: + ret[k] = None + else: + ret[k] = str(v) + ret.update(meta) + return ret + def create_image( self, name, @@ -643,21 +658,6 @@ class Proxy(proxy.Proxy): f"Image creation failed: {e!s}" ) from e - def _make_v2_image_params(self, meta, properties): - ret: dict = {} - for k, v in iter(properties.items()): - if k in _INT_PROPERTIES: - ret[k] = int(v) - elif k in _RAW_PROPERTIES: - ret[k] = v - else: - if v is None: - ret[k] = None - else: - ret[k] = str(v) - ret.update(meta) - return ret - def _upload_image_put( self, name,