[patch] fix function

Author: Sanjay Prabhakar

src/mas/devops/ocp.py

@@ -159,6 +159,47 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName:
             sleep(5)
     return foundReadyDeployment
 
+def getConsoleURL(dynClient: DynamicClient) -> str:
+    routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route")
+    consoleRoute = routesAPI.get(name="console", namespace="openshift-console")
+    return f"https://{consoleRoute.spec.host}"
+
+
+def getNodes(dynClient: DynamicClient) -> str:
+    nodesAPI = dynClient.resources.get(api_version="v1", kind="Node")
+    nodes = nodesAPI.get().to_dict()['items']
+    return nodes
+
+
+def getStorageClass(dynClient: DynamicClient, name: str) -> str:
+    try:
+        storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass")
+        storageclass = storageClassAPI.get(name=name)
+        return storageclass
+    except NotFoundError:
+        return None
+
+
+def getStorageClasses(dynClient: DynamicClient) -> list:
+    storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass")
+    storageClasses = storageClassAPI.get().items
+    return storageClasses
+
+
+def isSNO(dynClient: DynamicClient) -> bool:
+    return len(getNodes(dynClient)) == 1
+
+
+def crdExists(dynClient: DynamicClient, crdName: str) -> bool:
+    crdAPI = dynClient.resources.get(api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition")
+    try:
+        crdAPI.get(name=crdName)
+        logger.debug(f"CRD does exist: {crdName}")
+        return True
+    except NotFoundError:
+        logger.debug(f"CRD does not exist: {crdName}")
+        return False
+
 def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool:
     pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim")
     maxRetries = 60
@@ -184,7 +225,7 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor
     try:
         pvc = pvcAPI.get(name=pvcName, namespace=namespace)
         if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None:
-            if getStorageClasses is not None:
+            if storageClassName is not None and storageClassName(dynClient, name=storageClassName) is not None:
                 pvc.spec.storageClassName = storageClassName
             else:
                 defaultStorageClasses = getDefaultStorageClasses(dynClient)
@@ -218,47 +259,6 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor
         logger.error("PVC {pvcName} does not exist")
         return False
 
-def getConsoleURL(dynClient: DynamicClient) -> str:
-    routesAPI = dynClient.resources.get(api_version="route.openshift.io/v1", kind="Route")
-    consoleRoute = routesAPI.get(name="console", namespace="openshift-console")
-    return f"https://{consoleRoute.spec.host}"
-
-
-def getNodes(dynClient: DynamicClient) -> str:
-    nodesAPI = dynClient.resources.get(api_version="v1", kind="Node")
-    nodes = nodesAPI.get().to_dict()['items']
-    return nodes
-
-
-def getStorageClass(dynClient: DynamicClient, name: str) -> str:
-    try:
-        storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass")
-        storageclass = storageClassAPI.get(name=name)
-        return storageclass
-    except NotFoundError:
-        return None
-
-
-def getStorageClasses(dynClient: DynamicClient) -> list:
-    storageClassAPI = dynClient.resources.get(api_version="storage.k8s.io/v1", kind="StorageClass")
-    storageClasses = storageClassAPI.get().items
-    return storageClasses
-
-
-def isSNO(dynClient: DynamicClient) -> bool:
-    return len(getNodes(dynClient)) == 1
-
-
-def crdExists(dynClient: DynamicClient, crdName: str) -> bool:
-    crdAPI = dynClient.resources.get(api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition")
-    try:
-        crdAPI.get(name=crdName)
-        logger.debug(f"CRD does exist: {crdName}")
-        return True
-    except NotFoundError:
-        logger.debug(f"CRD does not exist: {crdName}")
-        return False
-
 
 # Assisted by WCA@IBM
 # Latest GenAI contribution: ibm/granite-8b-code-instruct