From 41528efc991527c64e2f56b8f77eeaafa94b8188 Mon Sep 17 00:00:00 2001 From: Akash Mukhopadhyay Date: Tue, 25 Jun 2024 01:40:09 -0700 Subject: [PATCH] Lint fixes --- .../azurecontainerstorage/_helpers.py | 22 +++++++++---------- .../managed_cluster_decorator.py | 6 ++++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py b/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py index e3449446089..c48c9ff11ba 100644 --- a/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py +++ b/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py @@ -449,19 +449,17 @@ def check_if_new_storagepool_creation_required( is_ephemeralDisk_nvme_enabled, is_ephemeralDisk_localssd_enabled, ) -> bool: - # pylint: disable=too-many-boolean-expressions - if ( - not is_extension_installed or - not (is_ephemeralDisk_localssd_enabled or is_ephemeralDisk_nvme_enabled) or - storage_pool_type != CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK or - ((ephemeral_disk_volume_type is None or - (existing_ephemeral_disk_volume_type.lower() == ephemeral_disk_volume_type.lower())) and - (ephemeral_disk_nvme_perf_tier is None or - (existing_ephemeral_nvme_perf_tier.lower() == ephemeral_disk_nvme_perf_tier.lower()))) - ): - return True + should_create_storagepool = ( + not is_extension_installed or + not (is_ephemeralDisk_localssd_enabled or is_ephemeralDisk_nvme_enabled) or + storage_pool_type != CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK or + ((ephemeral_disk_volume_type is None or + (existing_ephemeral_disk_volume_type.lower() == ephemeral_disk_volume_type.lower())) and + (ephemeral_disk_nvme_perf_tier is None or + (existing_ephemeral_nvme_perf_tier.lower() == ephemeral_disk_nvme_perf_tier.lower()))) + ) - return False + return should_create_storagepool def _get_ephemeral_nvme_cpu_value_based_on_vm_size_perf_tier(nodepool_skus, perf_tier): diff --git a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py index e71fc4f24ea..0a61da70791 100644 --- a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py +++ b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py @@ -4224,7 +4224,11 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster: if not (self.context.get_yes() or prompt_y_n(msg, default="n")): raise DecoratorEarlyExitException() - self.context.set_intermediate("azure_container_storage_perf_tier_op_set", True, overwrite_exists=True) + self.context.set_intermediate( + "azure_container_storage_perf_tier_op_set", + True, + overwrite_exists=True + ) # If the extension is already installed, # we expect that the Azure Container Storage