CSTACKEX-158: validating for 404 with error-code check

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java

@@ -22,6 +22,7 @@
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
+import feign.FeignException;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.feign.model.Lun;
@@ -247,15 +248,24 @@ public static boolean isOntapObjectNotFoundError(Throwable error) {
         if (error == null) {
             return false;
         }
+        if(error instanceof FeignException) {
+            FeignException feignException = (FeignException) error;
+            if (feignException.status() == 404) {
+                return true;
+            }
+        }
         String message = error.getMessage();
         if (message != null) {
             String lower = message.toLowerCase();
             if (lower.contains("404") || lower.contains("not found") || lower.contains("does not exist")
                     || lower.contains("entry doesn't exist")) {
                 return true;
             }
+        } else {
+            logger.warn("Error message is null for exception: {}", error.getClass().getName());
+            return false;
         }
-        return isOntapObjectNotFoundError(error.getCause());
+        return false;
     }
 
 }