Fix cancel maintain and maintain

Author: Srivastava, Piyush

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

@@ -352,13 +352,19 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
 
     @Override
     public boolean maintain(DataStore store) {
-        _storagePoolAutomation.maintain(store);
+        s_logger.info("Enable maintenance mode for datastore {}", store.getId());
+        Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(store.getId());
+        _storagePoolAutomation.maintain(store, details);
+        s_logger.info("Enabled maintenance mode for datastore {}", store.getId());
         return _dataStoreHelper.maintain(store);
     }
 
     @Override
     public boolean cancelMaintain(DataStore store) {
-        _storagePoolAutomation.cancelMaintain(store);
+        s_logger.info("Cancel maintenance mode for datastore {}", store.getId());
+        Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(store.getId());
+        _storagePoolAutomation.cancelMaintain(store, details);
+        s_logger.info("Cancelled maintenance mode for datastore {}", store.getId());
         return _dataStoreHelper.cancelMaintain(store);
     }
 
@@ -394,6 +400,7 @@ public boolean deleteDataStore(DataStore store) {
             // Create AccessGroup object with PrimaryDataStoreInfo
             AccessGroup accessGroup = new AccessGroup();
             accessGroup.setPrimaryDataStoreInfo(primaryDataStoreInfo);
+            accessGroup.setScope(store.getScope());
 
             // Call deleteAccessGroup - it will figure out scope, protocol, and all details internally
             storageStrategy.deleteAccessGroup(accessGroup);
@@ -403,6 +410,7 @@ public boolean deleteDataStore(DataStore store) {
         } catch (Exception e) {
             s_logger.error("deleteDataStore: Failed to delete access groups for storage pool id: {}. Error: {}",
                     storagePoolId, e.getMessage(), e);
+            // TODO need to ask the reason behind this ? This is keeping stale entries in storage_pool_details, storage_pool etc tables
             // Continue with CloudStack entity deletion even if ONTAP cleanup fails
             s_logger.warn("deleteDataStore: Proceeding with CloudStack entity deletion despite ONTAP cleanup failure");
         }

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

@@ -27,6 +27,7 @@
 import com.cloud.alert.AlertManager;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.dao.StoragePoolHostDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import com.cloud.agent.AgentManager;
@@ -52,6 +53,7 @@ public class OntapHostListener implements HypervisorHostListener {
     @Inject
     private HostDao _hostDao;
     @Inject private StoragePoolHostDao storagePoolHostDao;
+    @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
 
 
     @Override
@@ -74,7 +76,8 @@ public boolean hostConnect(long hostId, long poolId)  {
             // Create the ModifyStoragePoolCommand to send to the agent
             // Note: Always send command even if database entry exists, because agent may have restarted
             // and lost in-memory pool registration. The command handler is idempotent.
-            ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool);
+            java.util.Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(poolId);
+            ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, details);
 
             Answer answer = _agentMgr.easySend(hostId, cmd);
 

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

@@ -143,6 +143,7 @@ public AccessGroup createAccessGroup(AccessGroup accessGroup) {
 
     @Override
     public void deleteAccessGroup(AccessGroup accessGroup) {
+        // We need to delete the export policy
         //TODO
     }