Fixed the initial review comments

Author: Locharla, Sandeep

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignConfiguration.java

@@ -102,7 +102,7 @@ public RequestInterceptor createRequestInterceptor() {
         return template -> {
             logger.info("Feign Request URL: {}", template.url());
             logger.info("HTTP Method: {}", template.method());
-            logger.info("Headers: {}", template.headers());
+            logger.trace("Headers: {}", template.headers());
             if (template.body() != null) {
                 logger.info("Body: {}", new String(template.body(), StandardCharsets.UTF_8));
             }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -403,10 +403,11 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
                 for (HostVO host : hosts) {
                     if (host != null) {
                         ip =  host.getStorageIpAddress() != null ? host.getStorageIpAddress().trim() : "";
-                        if (ip.isEmpty() && host.getPrivateIpAddress() != null || host.getPrivateIpAddress().trim().isEmpty()) {
-                            return false;
-                        } else {
-                            ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;
+                        if (ip.isEmpty()) {
+                            if (host.getPrivateIpAddress() == null || host.getPrivateIpAddress().trim().isEmpty()) {
+                                return false;
+                            }
+                            ip = host.getPrivateIpAddress().trim();
                         }
                     }
                     hostIdentifiers.add(ip);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java

@@ -87,6 +87,11 @@ public boolean hostConnect(long hostId, long poolId)  {
                         "Unable to establish a connection from agent to storage pool %s due to %s", pool, answer.getDetails()));
             }
 
+            if (!(answer instanceof ModifyStoragePoolAnswer)) {
+                logger.error("Received unexpected answer type {} for storage pool {}", answer.getClass().getName(), pool.getName());
+                throw new CloudRuntimeException("Failed to connect to storage pool. Please check agent logs for details.");
+            }
+
             ModifyStoragePoolAnswer mspAnswer = (ModifyStoragePoolAnswer) answer;
             StoragePoolInfo poolInfo = mspAnswer.getPoolInfo();
             if (poolInfo == null) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

@@ -134,7 +134,6 @@ public boolean connect() {
                 return false;
             }
 
-            this.aggregates = aggrs;
             s_logger.info("Successfully connected to ONTAP cluster and validated ONTAP details provided");
         } catch (Exception e) {
             s_logger.error("Failed to connect to ONTAP cluster: " + e.getMessage(), e);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

@@ -141,6 +141,10 @@ public void deleteAccessGroup(AccessGroup accessGroup) {
             String svmName = storage.getSvmName();
             String exportPolicyName = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_NAME);
             String exportPolicyId = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_ID);
+            if (exportPolicyId == null || exportPolicyId.isEmpty()) {
+                s_logger.warn("deleteAccessGroup: Export policy ID not found in storage pool details for storage pool {}. Cannot delete export policy.", primaryDataStoreInfo.getName());
+                throw new CloudRuntimeException("Export policy ID not found for storage pool: " + primaryDataStoreInfo.getName());
+            }
 
             try {
                 nasFeignClient.deleteExportPolicyById(authHeader,exportPolicyId);

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

@@ -30,6 +30,7 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.util.Base64Utils;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class Utility {
@@ -40,7 +41,7 @@ public class Utility {
     private static final String AUTH_HEADER_COLON = ":";
 
     public static String generateAuthHeader (String username, String password) {
-        byte[] encodedBytes = Base64Utils.encode((username + AUTH_HEADER_COLON + password).getBytes());
+        byte[] encodedBytes = Base64Utils.encode((username + AUTH_HEADER_COLON + password).getBytes(StandardCharsets.UTF_8));
         return BASIC + StringUtils.SPACE + new String(encodedBytes);
     }