openstack-image-manager 0.20231212.0__py3-none-any.whl → 0.20231219.0__py3-none-any.whl

openstack_image_manager/manage.py

@@ -1097,7 +1097,11 @@ class ImageManager:
                             logger.info("Deactivating image '%s'" % image)
                             self.conn.image.deactivate_image(cloud_image.id)
 
-                        if self.CONF.hide and not self.CONF.dry_run:
+                        if (
+                            self.CONF.hide
+                            and not self.CONF.dry_run
+                            and cloud_image.visibility != "community"
+                        ):
                             logger.info(
                                 "Setting visibility of '%s' to 'community'" % image
                             )
@@ -1107,6 +1111,17 @@ class ImageManager:
                     except Exception as e:
                         logger.error("An Exception occurred: \n%s" % e)
                         self.exit_with_error = True
+            elif counter[image_name] <= last:
+                logger.info(
+                    f"Image '{image}' will not be deleted, {counter[image_name]} <= {last}"
+                )
+                if (
+                    self.CONF.hide
+                    and not self.CONF.dry_run
+                    and cloud_image.visibility != "community"
+                ):
+                    logger.info("Setting visibility of '%s' to 'community'" % image)
+                    self.conn.image.update_image(cloud_image.id, visibility="community")
             elif (
                 counter[image_name] < last and self.CONF.hide and not self.CONF.dry_run
             ):

openstack_image_manager/mirror.py

@@ -51,6 +51,18 @@ def main(
     logger.remove()
     logger.add(sys.stderr, format=log_fmt, level=level, colorize=True)
 
+    client = Minio(
+        minio_server,
+        access_key=minio_access_key,
+        secret_key=minio_secret_key,
+    )
+
+    result = client.bucket_exists(minio_bucket)
+    if not result:
+        logger.error(f"Create bucket '{minio_bucket}' first")
+        if not dry_run:
+            sys.exit(1)
+
     onlyfiles = []
     for f in listdir(images):
         if isfile(join(images, f)):
@@ -58,24 +70,17 @@ def main(
             onlyfiles.append(f)
 
     all_images = []
-    for file in onlyfiles:
+    for file in [x for x in onlyfiles if x.endswith(".yml")]:
+        logger.info(f"Processing file {file}")
         with open(join(images, file)) as fp:
             data = yaml.load(fp, Loader=yaml.SafeLoader)
             for image in data.get("images"):
                 logger.debug(f"Adding {image['name']} to the list of images")
                 all_images.append(image)
 
-    client = Minio(
-        minio_server,
-        access_key=minio_access_key,
-        secret_key=minio_secret_key,
-    )
-
-    result = client.bucket_exists(minio_bucket)
-    if not result:
-        logger.error(f"Create bucket '{minio_bucket}' first")
-
     for image in all_images:
+        logger.info(f"Processing image {image['name']}")
+
         if "versions" not in image:
             continue
 
@@ -105,31 +110,32 @@ def main(
 
             try:
                 client.stat_object(minio_bucket, os.path.join(dirname, filename))
-                logger.info(f"'{filename}' available in '{dirname}'")
+                logger.info(f"File {filename} available in bucket {dirname}")
             except S3Error:
-                logger.info(f"'{filename}' not yet available in '{dirname}'")
+                logger.info(f"File {filename} not yet available in bucket {dirname}")
 
-                logger.info(f"Downloading {version['source']}")
-                response = requests.get(
-                    version["source"], stream=True, allow_redirects=True
-                )
-                with open(os.path.basename(path.path), "wb") as fp:
-                    shutil.copyfileobj(response.raw, fp)
-                del response
+                if not isfile(os.path.basename(path.path)):
+                    logger.info(f"Downloading {version['source']}")
+                    response = requests.get(
+                        version["source"], stream=True, allow_redirects=True
+                    )
+                    with open(os.path.basename(path.path), "wb") as fp:
+                        shutil.copyfileobj(response.raw, fp)
+                    del response
 
                 if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-                    logger.info(f"Decompressing '{os.path.basename(path.path)}'")
+                    logger.info(f"Decompressing {os.path.basename(path.path)}")
                     patoolib.extract_archive(os.path.basename(path.path), outdir=".")
                     os.remove(os.path.basename(path.path))
 
                 if not dry_run:
-                    logger.info(f"Uploading '{filename}' to '{dirname}'")
+                    logger.info(f"Uploading {filename} to bucket {dirname}")
                     client.fput_object(
                         minio_bucket, os.path.join(dirname, filename), filename
                     )
                 else:
                     logger.info(
-                        f"Not uploading '{filename}' to '{dirname}' (dry-run enabled)"
+                        f"Not uploading {filename} to bucket {dirname} (dry-run enabled)"
                     )
 
                 os.remove(filename)

{openstack_image_manager-0.20231212.0.dist-info → openstack_image_manager-0.20231219.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20231212.0
+Version: 0.20231219.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License: Apache License
@@ -227,7 +227,7 @@ Requires-Dist: minio ==7.2.0
 Requires-Dist: munch ==4.0.0
 Requires-Dist: natsort ==8.4.0
 Requires-Dist: openstacksdk ==2.0.0
-Requires-Dist: paramiko ==3.3.1
+Requires-Dist: paramiko ==3.4.0
 Requires-Dist: patool ==1.15.0
 Requires-Dist: requests ==2.31.0
 Requires-Dist: ruamel.yaml ==0.18.5

openstack_image_manager-0.20231219.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
+openstack_image_manager/manage.py,sha256=-ESAYvzqxh3e_5B6JS6Ng7H-NdZ-9yMbMqPSM4mItso,47686
+openstack_image_manager/mirror.py,sha256=jiR3OubMzGvCBd-ma_m6k2dDDsWYgwzhdefCBKvUQZs,4738
+openstack_image_manager/table.py,sha256=cZ6Xuqp8uh2V5_uzT4KwWoiLAUdvsPZkrPjOXdxFeU4,1080
+openstack_image_manager/update.py,sha256=QCWbubWLao0UcADZnmM7rcNlWo02PLezwQbE1Tr8j0c,10546
+openstack_image_manager-0.20231219.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+openstack_image_manager-0.20231219.0.dist-info/METADATA,sha256=yAbf5SOdrIueV1WuHo-mc6BBnUO9k260GXYQnKGclNU,14876
+openstack_image_manager-0.20231219.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openstack_image_manager-0.20231219.0.dist-info/entry_points.txt,sha256=AEHPHHHZ3jAZfpvaI5ZzLi3DHb9vGQwL7TJcw_G_5nc,80
+openstack_image_manager-0.20231219.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
+openstack_image_manager-0.20231219.0.dist-info/RECORD,,

openstack_image_manager-0.20231212.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
-openstack_image_manager/manage.py,sha256=MCJZH9cg9_Zx46ATjzWrPyPVGwN-lJTAh8lcLihybpw,46990
-openstack_image_manager/mirror.py,sha256=rscIJO5c1ZDL5ejHKfHKJKOVSE_xTzxNBk006ytZyZk,4442
-openstack_image_manager/table.py,sha256=cZ6Xuqp8uh2V5_uzT4KwWoiLAUdvsPZkrPjOXdxFeU4,1080
-openstack_image_manager/update.py,sha256=QCWbubWLao0UcADZnmM7rcNlWo02PLezwQbE1Tr8j0c,10546
-openstack_image_manager-0.20231212.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-openstack_image_manager-0.20231212.0.dist-info/METADATA,sha256=VBYcpHP6uF435ryY58smiOhIlEDUHBSPDOm_uTCHidU,14876
-openstack_image_manager-0.20231212.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openstack_image_manager-0.20231212.0.dist-info/entry_points.txt,sha256=AEHPHHHZ3jAZfpvaI5ZzLi3DHb9vGQwL7TJcw_G_5nc,80
-openstack_image_manager-0.20231212.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
-openstack_image_manager-0.20231212.0.dist-info/RECORD,,