openstack-image-manager 0.20240723.0__py3-none-any.whl → 0.20240828.0__py3-none-any.whl

openstack_image_manager/main.py

@@ -92,9 +92,14 @@ class ImageManager:
             "project", "--share-type", help="Share - Type: 'project' or 'domain'"
         ),
         check: bool = typer.Option(
+            True,
+            "--check/--no-check",
+            help="Check the local image definitions against the SCS Image Metadata Standard (and process the images)",
+        ),
+        check_only: bool = typer.Option(
             False,
-            "--check",
-            help="Check the local image definitions against the SCS Image Metadata Standard",
+            "--check-only",
+            help="Quit after checking the image definitions against the SCS Image Metadata Standard",
         ),
     ):
         self.CONF = Munch.fromDict(locals())
@@ -209,11 +214,14 @@ class ImageManager:
         )
 
         # check local image definitions with yamale
-        if self.CONF.check:
+        if self.CONF.check or self.CONF.check_only:
             self.validate_yaml_schema()
 
+        if self.CONF.check_only:
+            return
+
         # share image (previously share.py)
-        elif self.CONF.share_image:
+        if self.CONF.share_image:
             self.create_connection()
             image = self.conn.get_image(self.CONF.share_image)
 
@@ -355,6 +363,9 @@ class ImageManager:
             if "image_description" not in image["meta"]:
                 image["meta"]["image_description"] = image["name"]
 
+            if "image_name" not in image["meta"]:
+                image["meta"]["image_name"] = image["name"]
+
             existing_images, imported_image, previous_image = self.process_image(
                 image, versions, sorted_versions, image["meta"].copy()
             )
@@ -362,7 +373,7 @@ class ImageManager:
 
             if imported_image and image["multi"]:
                 self.rename_images(
-                    image["name"], sorted_versions, imported_image, previous_image
+                    image, sorted_versions, imported_image, previous_image
                 )
 
         return managed_images
@@ -511,11 +522,14 @@ class ImageManager:
         previous_image = None
         upstream_checksum = ""
 
+        separator = image.get("separator", " ")
+        image_name = image["name"]
+
         for version in sorted_versions:
             if image["multi"]:
-                name = f"{image['name']} ({version})"
+                name = f"{image_name}{separator}({version})"
             else:
-                name = f"{image['name']} {version}"
+                name = f"{image_name}{separator}{version}"
 
             logger.info(f"Processing image '{name}'")
             logger.debug(f"Checking existence of '{name}'")
@@ -550,7 +564,7 @@ class ImageManager:
                 and version == sorted_versions[-1]
                 and not existence
             ):
-                previous = f"{image['name']} ({sorted_versions[-2]})"
+                previous = f"{image['name']}{separator}({sorted_versions[-2]})"
                 existence = previous in cloud_images and image["name"] in cloud_images
 
             elif (
@@ -825,7 +839,7 @@ class ImageManager:
 
     def rename_images(
         self,
-        name: str,
+        image: dict,
         sorted_versions: list,
         imported_image: Image,
         previous_image: Image,
@@ -834,16 +848,18 @@ class ImageManager:
         Rename outdated images in Glance (only applies to images of type multi)
 
         Params:
-            name: the name of the image from images.yml
+            image: image dict from images.yml
             sorted_versions: list with all sorted image versions
             imported_image: the newly imported image
             previous_image: the previous latest image
         """
+        name = image["name"]
+        separator = image.get("separator", " ")
         cloud_images = self.get_images()
 
         if len(sorted_versions) > 1:
-            latest = f"{name} ({sorted_versions[-1]})"
-            previous_latest = f"{name} ({sorted_versions[-2]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
+            previous_latest = f"{name}{separator}({sorted_versions[-2]})"
 
             if name in cloud_images and previous_latest not in cloud_images:
                 logger.info(f"Renaming {name} to {previous_latest}")
@@ -865,7 +881,7 @@ class ImageManager:
                 )
                 create_date = create_date.replace("-", "")
 
-                previous_latest = f"{name} ({create_date})"
+                previous_latest = f"{name}{separator}({create_date})"
 
                 logger.info(
                     f"Setting internal_version: {create_date} for {previous_latest}"
@@ -874,9 +890,7 @@ class ImageManager:
                     previous_image.id, **{"internal_version": create_date}
                 )
             else:
-                previous_latest = (
-                    f"{name} ({previous_image['properties']['internal_version']})"
-                )
+                previous_latest = f"{name}{separator}({previous_image['properties']['internal_version']})"
 
             logger.info(f"Renaming old latest '{name}' to '{previous_latest}'")
             self.conn.image.update_image(previous_image.id, name=previous_latest)
@@ -885,7 +899,7 @@ class ImageManager:
             self.conn.image.update_image(imported_image.id, name=name)
 
         elif len(sorted_versions) == 1:
-            latest = f"{name} ({sorted_versions[-1]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
 
             if latest in cloud_images:
                 logger.info(f"Renaming {latest} to {name}")
@@ -1102,23 +1116,29 @@ class ImageManager:
         """Validate all image.yaml files against the SCS Metadata spec"""
         schema = yamale.make_schema("etc/schema.yaml")
         try:
+            validation_error_log = []
             for file in os.listdir(self.CONF.images):
                 try:
                     data = yamale.make_data(self.CONF.images + file)
                     yamale.validate(schema, data)
                 except YamaleError as e:
-                    self.exit_with_error = True
                     for result in e.results:
                         logger.error(
                             f"Error validating data '{result.data}' with '{result.schema}'"
                         )
                         for error in result.errors:
                             logger.error(f"\t{error}")
+                            validation_error_log.append((file, error))
                 else:
                     logger.debug(f"Image file {file} is valid")
         except FileNotFoundError:
             logger.error(f"Invalid path '{self.CONF.images}'")
 
+        if len(validation_error_log) > 0:
+            sys.exit(
+                f"Image definition validation failed with these error(s): {validation_error_log}"
+            )
+
     def share_image_with_project(self, image, project):
         member = self.conn.image.find_member(project.id, image.id)
 

{openstack_image_manager-0.20240723.0.dist-info → openstack_image_manager-0.20240828.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240723.0
+Version: 0.20240828.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License: Apache License
@@ -222,18 +222,18 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: loguru ==0.7.2
-Requires-Dist: minio ==7.2.7
-Requires-Dist: munch ==4.0.0
-Requires-Dist: natsort ==8.4.0
-Requires-Dist: openstacksdk ==3.3.0
-Requires-Dist: paramiko ==3.4.0
-Requires-Dist: patool ==2.3.0
-Requires-Dist: requests ==2.32.3
-Requires-Dist: ruamel.yaml ==0.18.6
-Requires-Dist: tabulate ==0.9.0
-Requires-Dist: typer[all] ==0.12.3
-Requires-Dist: yamale ==5.2.1
+Requires-Dist: loguru==0.7.2
+Requires-Dist: minio==7.2.8
+Requires-Dist: munch==4.0.0
+Requires-Dist: natsort==8.4.0
+Requires-Dist: openstacksdk==3.3.0
+Requires-Dist: paramiko==3.4.1
+Requires-Dist: patool==2.4.0
+Requires-Dist: requests==2.32.3
+Requires-Dist: ruamel.yaml==0.18.6
+Requires-Dist: tabulate==0.9.0
+Requires-Dist: typer[all]==0.12.5
+Requires-Dist: yamale==5.2.1
 
 # openstack-image-manager
 

openstack_image_manager-0.20240828.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
+openstack_image_manager/main.py,sha256=uDj3ZpehvA2VzAHd7itHcyT56XEnY1gYTdkjRD-2kz0,47297
+openstack_image_manager-0.20240828.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+openstack_image_manager-0.20240828.0.dist-info/METADATA,sha256=EhhClCe6kY3we9ahgEDLk-IGPrz7WQYaQ0YBGvxJ-2s,14850
+openstack_image_manager-0.20240828.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+openstack_image_manager-0.20240828.0.dist-info/entry_points.txt,sha256=IrOGjHJbCa6-jmCQiqiKFqHeVvjGa1p25s2mLkt0da8,78
+openstack_image_manager-0.20240828.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
+openstack_image_manager-0.20240828.0.dist-info/RECORD,,

{openstack_image_manager-0.20240723.0.dist-info → openstack_image_manager-0.20240828.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

openstack_image_manager-0.20240723.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
-openstack_image_manager/main.py,sha256=DL_998wsL7HhoWiwooRXjrPxupKZLgzYoqbkKa7IHHc,46458
-openstack_image_manager-0.20240723.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-openstack_image_manager-0.20240723.0.dist-info/METADATA,sha256=rzvLeVJtIcUtx4bjoxKL-ZJITgDZHmLLDhHlDpkOUlU,14862
-openstack_image_manager-0.20240723.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-openstack_image_manager-0.20240723.0.dist-info/entry_points.txt,sha256=IrOGjHJbCa6-jmCQiqiKFqHeVvjGa1p25s2mLkt0da8,78
-openstack_image_manager-0.20240723.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
-openstack_image_manager-0.20240723.0.dist-info/RECORD,,