CSTACKEX-117 Decode the password

Author: Gupta, Surya

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

@@ -57,4 +57,14 @@ public Long getSize() {
     public ProtocolType getProtocol() {
         return protocolType;
     }
+
+    @Override
+    public String toString() {
+        return "OntapStorage{" +
+            "username='" + username + '\'' +
+            ", storageIP='" + storageIP + '\'' +
+            ", svmName='" + svmName + '\'' +
+            ", protocol=" + protocolType +
+            '}';
+    }
 }

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

@@ -183,7 +183,8 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         details.put(Constants.SIZE, capacityBytes.toString());
 
         ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
-
+        
+        s_logger.info("password::::::: " + details.get(Constants.PASSWORD));
         // Connect to ONTAP and create volume
         long volumeSize = Long.parseLong(details.get(Constants.SIZE));
         OntapStorage ontapStorage = new OntapStorage(

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java

@@ -21,6 +21,9 @@
 
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
+
+import java.nio.charset.StandardCharsets;
+
 import org.apache.cloudstack.storage.feign.model.OntapStorage;
 import org.apache.cloudstack.storage.service.StorageStrategy;
 import org.apache.cloudstack.storage.service.UnifiedNASStrategy;
@@ -34,8 +37,20 @@ public class StorageProviderFactory {
     private static final Logger s_logger = LogManager.getLogger(StorageProviderFactory.class);
 
     public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
+        s_logger.info("Initializing ontapStorage:::::::::::: " + ontapStorage.toString());
         ProtocolType protocol = ontapStorage.getProtocol();
         s_logger.info("Initializing StorageProviderFactory with protocol: " + protocol);
+        String decodedPassword = new String(java.util.Base64.getDecoder().decode(ontapStorage.getPassword()), StandardCharsets.UTF_8);
+        s_logger.info("Initializing StorageProviderFactory with decoded password: " + decodedPassword);
+        ontapStorage = new OntapStorage(
+            ontapStorage.getUsername(),
+            decodedPassword,
+            ontapStorage.getStorageIP(),
+            ontapStorage.getSvmName(),
+            ontapStorage.getSize(),
+            protocol);
+        s_logger.info("Initializing ontapStorage1:::::::::::: " + ontapStorage.toString());
+    
         switch (protocol) {
             case NFS3:
                 UnifiedNASStrategy unifiedNASStrategy = new UnifiedNASStrategy(ontapStorage);

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

@@ -96,8 +96,7 @@ public boolean connect() {
         s_logger.info("Attempting to connect to ONTAP cluster at " + storage.getStorageIP() + " and validate SVM " +
                 storage.getSvmName() + ", protocol " + storage.getProtocol());
         //Get AuthHeader
-        String decodedPassword = new String(java.util.Base64.getDecoder().decode(storage.getPassword()), java.nio.charset.StandardCharsets.UTF_8);
-        String authHeader = Utility.generateAuthHeader(storage.getUsername(), decodedPassword);
+        String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
         String svmName = storage.getSvmName();
         try {
             // Call the SVM API to check if the SVM exists

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

@@ -75,7 +75,7 @@ public UnifiedNASStrategy(OntapStorage ontapStorage) {
         String baseURL = Constants.HTTPS + ontapStorage.getStorageIP();
         this.feignClientFactory = new FeignClientFactory();
         this.nasFeignClient = feignClientFactory.createClient(NASFeignClient.class, baseURL);
-        this.volumeFeignClient = feignClientFactory.createClient(VolumeFeignClient.class,baseURL );
+        this.volumeFeignClient = feignClientFactory.createClient(VolumeFeignClient.class, baseURL);
         this.jobFeignClient = feignClientFactory.createClient(JobFeignClient.class, baseURL );
     }