From 1915c3d9c412b5ab3d98803bf456a2f71a922a51 Mon Sep 17 00:00:00 2001 From: Amrita Mahapatra <49347640+amr1ta@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:32:11 +0530 Subject: [PATCH] Updated local storage option operator image details Signed-off-by: Amrita Mahapatra <49347640+amr1ta@users.noreply.github.com> --- ocs_ci/ocs/resources/storage_client.py | 13 ++++++++----- .../local-storage-optional-operators.yaml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ocs_ci/ocs/resources/storage_client.py b/ocs_ci/ocs/resources/storage_client.py index 852284c852b8..78a21b79bbf3 100644 --- a/ocs_ci/ocs/resources/storage_client.py +++ b/ocs_ci/ocs/resources/storage_client.py @@ -430,7 +430,7 @@ def create_native_storage_client( onboarding_token=onboarding_token, ) - if self.ocs_version < 4.16: + if self.ocs_version < version.VERSION_4_16: self.create_storageclaim( storageclaim_name="ocs-storagecluster-ceph-rbd", type="blockpool", @@ -451,7 +451,7 @@ def verify_native_storageclient(self): storageclaims, associated storageclasses and storagerequests are created successfully. """ - if self.ocs_version >= 4.16: + if self.ocs_version >= version.VERSION_4_16: namespace = config.ENV_DATA["cluster_namespace"] else: namespace = constants.OPENSHIFT_STORAGE_CLIENT_NAMESPACE @@ -460,12 +460,15 @@ def verify_native_storageclient(self): kind=constants.STORAGECLIENT, namespace=namespace, ) + storageclient = storageclient_obj.get()["items"][0] + storageclient_name = storageclient["metadata"]["name"] + # Verify storageclient is in Connected status - assert self.verify_storageclient_status(namespace=namespace) + assert self.verify_storageclient_status( + storageclient_name=storageclient_name, namespace=namespace + ) # Validate storageclaims are Ready and associated storageclasses are created - storageclient = storageclient_obj.get()["items"][0] - storageclient_name = storageclient["metadata"]["name"] verify_storageclient_storageclass_claims(storageclient_name) # Validate storagerequests are created successfully diff --git a/ocs_ci/templates/ocs-deployment/local-storage-optional-operators.yaml b/ocs_ci/templates/ocs-deployment/local-storage-optional-operators.yaml index e855a8d67790..3eedad44cc31 100644 --- a/ocs_ci/templates/ocs-deployment/local-storage-optional-operators.yaml +++ b/ocs_ci/templates/ocs-deployment/local-storage-optional-operators.yaml @@ -27,6 +27,6 @@ spec: icon: base64data: "" mediatype: "" - image: quay.io/openshift-qe-optional-operators/ocp4-index:latest + image: quay.io/openshift-qe-optional-operators/aosqe-index:latest publisher: Red Hat sourceType: grpc