{Compute} Fix ModuleNotFoundError by removing unnecessary gallery_image_versions

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -164,7 +164,6 @@ def default_api_version(self):
             'snapshots': '2023-10-02',
             'galleries': '2021-10-01',
             'gallery_images': '2021-10-01',
-            'gallery_image_versions': '2024-03-03',
             'gallery_applications': '2021-07-01',
             'gallery_application_versions': '2022-01-03',
             'shared_galleries': '2022-01-03',

src/azure-cli/azure/cli/command_modules/vm/commands.py

@@ -358,7 +358,7 @@ def load_command_table(self, _):
         from .operations.sig_image_definition import SigImageDefinitionListShared
         self.command_table['sig image-definition list-shared'] = SigImageDefinitionListShared(loader=self)
 
-    with self.command_group('sig image-version', operation_group='gallery_image_versions') as g:
+    with self.command_group('sig image-version') as g:
         g.custom_command('create', 'create_image_version', supports_no_wait=True, validator=process_image_version_create_namespace)
         g.custom_command('undelete', 'undelete_image_version', supports_no_wait=True, validator=process_image_version_undelete_namespace, is_preview=True)
         g.generic_update_command('update', getter_name='get_image_version_to_update', setter_arg_name='gallery_image_version', setter_name='update_image_version', setter_type=compute_custom, command_type=compute_custom, supports_no_wait=True, validator=process_image_version_update_namespace)

src/azure-cli/azure/cli/command_modules/vm/custom.py

@@ -5757,102 +5757,92 @@ def create_image_version(cmd, resource_group_name, gallery_name, gallery_image_n
 
     if replication_mode is not None:
         profile["replication_mode"] = replication_mode
-    if not cmd.supported_api_version(min_api='2022-03-03', operation_group='gallery_image_versions'):
-        source = {"managed_image": {"id": managed_image}}
-        profile["source"] = source
-
-    if cmd.supported_api_version(min_api='2019-07-01', operation_group='gallery_image_versions'):
-        if managed_image is None and os_snapshot is None and os_vhd_uri is None:
-            raise RequiredArgumentMissingError('usage error: Please provide --managed-image or --os-snapshot or --vhd')
-
-        source = os_disk_image = data_disk_images = None
-        if virtual_machine is not None and cmd.supported_api_version(min_api='2023-07-03',
-                                                                     operation_group='gallery_image_versions'):
-            source = {"virtual_machine_id": virtual_machine}
-        elif managed_image is not None:
-            source = {"id": managed_image}
-        if os_snapshot is not None:
-            os_disk_image = {"source": {"id": os_snapshot}}
-        if data_snapshot_luns and not data_snapshots:
-            raise ArgumentUsageError('usage error: --data-snapshot-luns must be used together with --data-snapshots')
-        if data_snapshots:
-            if data_snapshot_luns and len(data_snapshots) != len(data_snapshot_luns):
-                raise ArgumentUsageError('usage error: Length of --data-snapshots and '
-                                         '--data-snapshot-luns should be equal.')
-            if not data_snapshot_luns:
-                data_snapshot_luns = list(range(len(data_snapshots)))
-            data_disk_images = []
-            for i, s in enumerate(data_snapshots):
-                data_disk_images.append({"source": {"id": s}, "lun": int(data_snapshot_luns[i])})
-        # from vhd, only support os image now
-        if cmd.supported_api_version(min_api='2020-09-30', operation_group='gallery_image_versions'):
-            # OS disk
-            if os_vhd_uri and os_vhd_storage_account is None or os_vhd_uri is None and os_vhd_storage_account:
-                raise ArgumentUsageError('--os-vhd-uri and --os-vhd-storage-account should be used together.')
-            if os_vhd_uri and os_vhd_storage_account:
-                if not is_valid_resource_id(os_vhd_storage_account):
-                    os_vhd_storage_account = resource_id(
-                        subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
-                        namespace='Microsoft.Storage', type='storageAccounts', name=os_vhd_storage_account)
-                os_disk_image = {
-                    "source": {
-                        "storage_account_id": os_vhd_storage_account,
-                        "uri": os_vhd_uri
-                    }
-                }
 
-            # Data disks
-            if data_vhds_uris and data_vhds_storage_accounts is None or \
-                    data_vhds_uris is None and data_vhds_storage_accounts:
-                raise ArgumentUsageError('--data-vhds-uris and --data-vhds-storage-accounts should be used together.')
-            if data_vhds_luns and data_vhds_uris is None:
-                raise ArgumentUsageError('--data-vhds-luns must be used together with --data-vhds-uris')
-            if data_vhds_uris:
-                # Generate LUNs
-                if data_vhds_luns is None:
-                    # 0, 1, 2, ...
-                    data_vhds_luns = list(range(len(data_vhds_uris)))
-                # Check length
-                len_data_vhds_uris = len(data_vhds_uris)
-                len_data_vhds_luns = len(data_vhds_luns)
-                len_data_vhds_storage_accounts = len(data_vhds_storage_accounts)
-                if len_data_vhds_uris != len_data_vhds_luns or len_data_vhds_uris != len_data_vhds_storage_accounts:
-                    raise ArgumentUsageError(
-                        'Length of --data-vhds-uris, --data-vhds-luns, --data-vhds-storage-accounts must be same.')
-                # Generate full storage account ID
-                for i, storage_account in enumerate(data_vhds_storage_accounts):
-                    if not is_valid_resource_id(storage_account):
-                        data_vhds_storage_accounts[i] = resource_id(
-                            subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
-                            namespace='Microsoft.Storage', type='storageAccounts', name=storage_account)
-                if data_disk_images is None:
-                    data_disk_images = []
-                for uri, lun, account in zip(data_vhds_uris, data_vhds_luns, data_vhds_storage_accounts):
-                    data_disk_images.append({
-                        "source": {"storage_account_id": account, "uri": uri},
-                        "lun": lun
-                    })
+    if managed_image is None and os_snapshot is None and os_vhd_uri is None:
+        raise RequiredArgumentMissingError('usage error: Please provide --managed-image or --os-snapshot or --vhd')
+
+    source = os_disk_image = data_disk_images = None
+    if virtual_machine is not None:
+        source = {"virtual_machine_id": virtual_machine}
+    elif managed_image is not None:
+        source = {"id": managed_image}
+    if os_snapshot is not None:
+        os_disk_image = {"source": {"id": os_snapshot}}
+    if data_snapshot_luns and not data_snapshots:
+        raise ArgumentUsageError('usage error: --data-snapshot-luns must be used together with --data-snapshots')
+    if data_snapshots:
+        if data_snapshot_luns and len(data_snapshots) != len(data_snapshot_luns):
+            raise ArgumentUsageError('usage error: Length of --data-snapshots and '
+                                     '--data-snapshot-luns should be equal.')
+        if not data_snapshot_luns:
+            data_snapshot_luns = list(range(len(data_snapshots)))
+        data_disk_images = []
+        for i, s in enumerate(data_snapshots):
+            data_disk_images.append({"source": {"id": s}, "lun": int(data_snapshot_luns[i])})
+    # from vhd, only support os image now
+    # OS disk
+    if os_vhd_uri and os_vhd_storage_account is None or os_vhd_uri is None and os_vhd_storage_account:
+        raise ArgumentUsageError('--os-vhd-uri and --os-vhd-storage-account should be used together.')
+    if os_vhd_uri and os_vhd_storage_account:
+        if not is_valid_resource_id(os_vhd_storage_account):
+            os_vhd_storage_account = resource_id(
+                subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
+                namespace='Microsoft.Storage', type='storageAccounts', name=os_vhd_storage_account)
+        os_disk_image = {
+            "source": {
+                "storage_account_id": os_vhd_storage_account,
+                "uri": os_vhd_uri
+            }
+        }
 
-        storage_profile = {"source": source, "os_disk_image": os_disk_image, "data_disk_images": data_disk_images}
-        args = {
-            "publishing_profile": profile,
-            "location": location,
-            "tags": tags or {},
-            "storage_profile": storage_profile
+    # Data disks
+    if data_vhds_uris and data_vhds_storage_accounts is None or \
+            data_vhds_uris is None and data_vhds_storage_accounts:
+        raise ArgumentUsageError('--data-vhds-uris and --data-vhds-storage-accounts should be used together.')
+    if data_vhds_luns and data_vhds_uris is None:
+        raise ArgumentUsageError('--data-vhds-luns must be used together with --data-vhds-uris')
+    if data_vhds_uris:
+        # Generate LUNs
+        if data_vhds_luns is None:
+            # 0, 1, 2, ...
+            data_vhds_luns = list(range(len(data_vhds_uris)))
+        # Check length
+        len_data_vhds_uris = len(data_vhds_uris)
+        len_data_vhds_luns = len(data_vhds_luns)
+        len_data_vhds_storage_accounts = len(data_vhds_storage_accounts)
+        if len_data_vhds_uris != len_data_vhds_luns or len_data_vhds_uris != len_data_vhds_storage_accounts:
+            raise ArgumentUsageError(
+                'Length of --data-vhds-uris, --data-vhds-luns, --data-vhds-storage-accounts must be same.')
+        # Generate full storage account ID
+        for i, storage_account in enumerate(data_vhds_storage_accounts):
+            if not is_valid_resource_id(storage_account):
+                data_vhds_storage_accounts[i] = resource_id(
+                    subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
+                    namespace='Microsoft.Storage', type='storageAccounts', name=storage_account)
+        if data_disk_images is None:
+            data_disk_images = []
+        for uri, lun, account in zip(data_vhds_uris, data_vhds_luns, data_vhds_storage_accounts):
+            data_disk_images.append({
+                "source": {"storage_account_id": account, "uri": uri},
+                "lun": lun
+            })
+
+    storage_profile = {"source": source, "os_disk_image": os_disk_image, "data_disk_images": data_disk_images}
+    args = {
+        "publishing_profile": profile,
+        "location": location,
+        "tags": tags or {},
+        "storage_profile": storage_profile
+    }
+    if allow_replicated_location_deletion is not None:
+        args["safety_profile"] = {
+            "allow_deletion_of_replicated_locations": allow_replicated_location_deletion
         }
-        if allow_replicated_location_deletion is not None:
-            args["safety_profile"] = {
-                "allow_deletion_of_replicated_locations": allow_replicated_location_deletion
-            }
-        if block_deletion_before_end_of_life is not None:
-            if "safety_profile" not in args:
-                args["safety_profile"] = {}
+    if block_deletion_before_end_of_life is not None:
+        if "safety_profile" not in args:
+            args["safety_profile"] = {}
 
-            args["safety_profile"]["block_deletion_before_end_of_life"] = block_deletion_before_end_of_life
-    else:
-        if managed_image is None:
-            raise RequiredArgumentMissingError('usage error: Please provide --managed-image')
-        args = {"publishing_profile": profile, "location": location, "tags": tags or {}}
+        args["safety_profile"]["block_deletion_before_end_of_life"] = block_deletion_before_end_of_life
 
     args["resource_group"] = resource_group_name
     args["gallery_name"] = gallery_name