retrieves only Ubuntu images

Author: Cohen-J-Omer

src/ibm_ray_config/modules/gen2/image.py

@@ -16,12 +16,12 @@ def get_image_objects(self):
         """
         images = []
         res = self.ibm_vpc_client.list_images().get_result()
-        filtered_res  = filter_images(res['images'],['operating_system','architecture'],"amd" )
+        filtered_res  = filter_images_ubuntu_amd(res['images'])
         images.extend(filtered_res)
         while res.get('next',None):
             link_to_next = res['next']['href'].split('start=')[1].split('&limit')[0]
             res = self.ibm_vpc_client.list_images(start=link_to_next).get_result()
-            filtered_res  = filter_images(res['images'],['operating_system','architecture'],"amd" )
+            filtered_res  = filter_images_ubuntu_amd(res['images'])
             images.extend(filtered_res)
 
         return sorted(images,key = lambda img:img['name'])
@@ -31,7 +31,7 @@ def run(self) -> Dict[str, Any]:
 
         image_objects = self.get_image_objects()
 
-        default = find_default({'name': 'ibm-ubuntu-20-04-'}, image_objects, name='name', substring=True)
+        default = find_default({'name': 'ibm-ubuntu-22-04-'}, image_objects, name='name', substring=True)
         image_obj = find_obj(image_objects, 'Please choose an image. Ubuntu image is advised as node setup is using apt.', default=default)
 
         if 'ubuntu' not in image_obj['name']: 
@@ -47,31 +47,24 @@ def verify(self, base_config):
             image_obj = find_obj(image_objects, 'dummy', obj_id=image_id)
         else:
             # find first occurrence
-            image_obj = next((obj for obj in image_objects if 'ibm-ubuntu-20-04-' in obj['name']), None)
+            image_obj = next((obj for obj in image_objects if 'ibm-ubuntu-22-04-' in obj['name']), None)
 
         return image_obj['id'], image_obj['minimum_provisioned_size'], image_obj['owner_type'] == 'user'
 
     @update_decorator
     def create_default(self):
         image_objects = self.ibm_vpc_client.list_images().get_result()['images']
 
-        image_obj = next((image for image in image_objects if 'ibm-ubuntu-20-04-' in image['name']), None)
+        image_obj = next((image for image in image_objects if 'ibm-ubuntu-22-04-' in image['name']), None)
 
-        print(f'Selected \033[92mUbuntu\033[0m 20.04 VM image, {image_obj["name"]}')
+        print(f'Selected \033[92mUbuntu\033[0m 22.04 VM image, {image_obj["name"]}')
         return image_obj['id'], image_obj['minimum_provisioned_size'], image_obj['owner_type'] == 'user'
 
-def filter_images(images, fields, value):
-    """returns filtered list of images matching the prefix of the specified value of a given field
+def filter_images_ubuntu_amd(images):
+    """returns Ubuntu images with amd architecture  
     
-    images (dict) 
-    fields (str) - list of dict possibly multilevel dict fields 
-    value (str) - prefix of required value   
+    images (dict): image objects 
     """
-    filtered_images = []
-    for image in images:
-        img_copy = image.copy()
-        for field in fields:
-            img_copy = img_copy.get(field)
-        if img_copy and img_copy.startswith(value): 
-            filtered_images.append(image) 
-    return filtered_images
+    return [image for image in images if 'amd' in 
+            image['operating_system']['architecture']
+            and 'ubuntu' in image['operating_system']['name']]