feature/CSTACKEX-122: remove method name from exception

Srivastava, Piyush · Srivastava, Piyush · commit 6f266fef720e · 2026-03-11T13:27:09.000+05:30
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
@@ -268,16 +268,16 @@ public DataStore initialize(Map<String, Object> dsInfos) {
     public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
         logger.debug("In attachCluster for ONTAP primary storage");
         if (dataStore == null) {
-            throw new InvalidParameterValueException("attachCluster: dataStore should not be null");
+            throw new InvalidParameterValueException(" dataStore should not be null");
         }
         if (scope == null) {
-            throw new InvalidParameterValueException("attachCluster: scope should not be null");
+            throw new InvalidParameterValueException(" scope should not be null");
         }
         List<String> hostsIdentifier = new ArrayList<>();
         StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId());
         if (storagePool == null) {
             s_logger.error("attachCluster : Storage Pool not found for id: " + dataStore.getId());
-            throw new CloudRuntimeException("attachCluster : Storage Pool not found for id: " + dataStore.getId());
+            throw new CloudRuntimeException(" Storage Pool not found for id: " + dataStore.getId());
         }
         PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
         List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInClusterForStorageConnection(primaryStore);
@@ -305,7 +305,7 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
                     strategy.createAccessGroup(accessGroupRequest);
                 } catch (Exception e) {
                     s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
-                    throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
+                    throw new CloudRuntimeException("Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
                 }
             }
         }
@@ -332,16 +332,16 @@ public boolean attachHost(DataStore store, HostScope scope, StoragePoolInfo exis
     public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.HypervisorType hypervisorType) {
         logger.debug("In attachZone for ONTAP primary storage");
         if (dataStore == null) {
-            throw new InvalidParameterValueException("attachZone: dataStore should not be null");
+            throw new InvalidParameterValueException("dataStore should not be null");
         }
         if (scope == null) {
-            throw new InvalidParameterValueException("attachZone: scope should not be null");
+            throw new InvalidParameterValueException("scope should not be null");
         }
         List<String> hostsIdentifier = new ArrayList<>();
         StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId());
         if (storagePool == null) {
             s_logger.error("attachZone : Storage Pool not found for id: " + dataStore.getId());
-            throw new CloudRuntimeException("attachZone : Storage Pool not found for id: " + dataStore.getId());
+            throw new CloudRuntimeException("Storage Pool not found for id: " + dataStore.getId());
         }
 
         PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
@@ -370,7 +370,7 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
                     strategy.createAccessGroup(accessGroupRequest);
                 } catch (Exception e) {
                     s_logger.error("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
-                    throw new CloudRuntimeException("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
+                    throw new CloudRuntimeException(" Failed to create access group on storage system for zone with Exception: " + e.getMessage());
                 }
             }
         }
@@ -393,7 +393,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
                 for (HostVO host : hosts) {
                     if (host == null || host.getStorageUrl() == null || host.getStorageUrl().trim().isEmpty()
                             || !host.getStorageUrl().startsWith(protocolPrefix)) {
-                        return false;
+                        // TODO we will inform customer through alert for excluded host because of protocol enabled on host
+                        continue;
                     }
                     hostIdentifiers.add(host.getStorageUrl());
                 }
@@ -404,7 +405,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
                     if (host != null) {
                         ip =  host.getStorageIpAddress() != null ? host.getStorageIpAddress().trim() : "";
                         if (ip.isEmpty() && host.getPrivateIpAddress() != null || host.getPrivateIpAddress().trim().isEmpty()) {
-                            return false;
+                            // TODO we will inform customer through alert for excluded host because of protocol enabled on host
+                            continue;
                         } else {
                             ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;
                         }
@@ -413,7 +415,7 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
                 }
                 break;
             default:
-                throw new CloudRuntimeException("validateProtocolSupportAndFetchHostsIdentifier : Unsupported protocol: " + protocolType.name());
+                throw new CloudRuntimeException("Unsupported protocol: " + protocolType.name());
         }
         logger.info("validateProtocolSupportAndFetchHostsIdentifier: All hosts support the protocol: " + protocolType.name());
         return true;
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java
@@ -23,9 +23,6 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import feign.FeignException;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.feign.FeignClientFactory;
-import org.apache.cloudstack.storage.feign.client.SANFeignClient;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
 import org.apache.cloudstack.storage.feign.model.Igroup;
 import org.apache.cloudstack.storage.feign.model.Initiator;
 import org.apache.cloudstack.storage.feign.model.Svm;
@@ -67,7 +64,7 @@ public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume
         s_logger.info("createCloudStackVolume : Creating Lun with cloudstackVolume request {} ", cloudstackVolume);
         if (cloudstackVolume == null || cloudstackVolume.getLun() == null) {
             s_logger.error("createCloudStackVolume: LUN creation failed. Invalid request: {}", cloudstackVolume);
-            throw new CloudRuntimeException("createCloudStackVolume : Failed to create Lun, invalid request");
+            throw new CloudRuntimeException(" Failed to create Lun, invalid request");
         }
         try {
             // Get AuthHeader
@@ -106,7 +103,7 @@ CloudStackVolume updateCloudStackVolume(CloudStackVolume cloudstackVolume) {
     public void deleteCloudStackVolume(CloudStackVolume cloudstackVolume) {
         if (cloudstackVolume == null || cloudstackVolume.getLun() == null) {
             s_logger.error("deleteCloudStackVolume: Lun deletion failed. Invalid request: {}", cloudstackVolume);
-            throw new CloudRuntimeException("deleteCloudStackVolume : Failed to delete Lun, invalid request");
+            throw new CloudRuntimeException(" Failed to delete Lun, invalid request");
         }
         s_logger.info("deleteCloudStackVolume : Deleting Lun: {}", cloudstackVolume.getLun().getName());
         try {
@@ -139,13 +136,13 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> values) {
         s_logger.debug("getCloudStackVolume : fetching Lun with params {} ", values);
         if (values == null || values.isEmpty()) {
             s_logger.error("getCloudStackVolume: get Lun failed. Invalid request: {}", values);
-            throw new CloudRuntimeException("getCloudStackVolume : get Lun Failed, invalid request");
+            throw new CloudRuntimeException(" get Lun Failed, invalid request");
         }
         String svmName = values.get(Constants.SVM_DOT_NAME);
         String lunName = values.get(Constants.NAME);
         if (svmName == null || lunName == null || svmName.isEmpty() || lunName.isEmpty()) {
             s_logger.error("getCloudStackVolume: get Lun failed. Invalid svm:{} or Lun name: {}", svmName, lunName);
-            throw new CloudRuntimeException("getCloudStackVolume : Failed to get Lun, invalid request");
+            throw new CloudRuntimeException("Failed to get Lun, invalid request");
         }
         try {
             String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
@@ -180,14 +177,14 @@ public AccessGroup createAccessGroup(AccessGroup accessGroup) {
         s_logger.debug("createAccessGroup : Creating Igroup with access group request {} ", accessGroup);
         if (accessGroup == null) {
             s_logger.error("createAccessGroup: Igroup creation failed. Invalid request: {}", accessGroup);
-            throw new CloudRuntimeException("createAccessGroup : Failed to create Igroup, invalid request");
+            throw new CloudRuntimeException(" Failed to create Igroup, invalid request");
         }
         // Get StoragePool details
         if (accessGroup.getStoragePoolId() == null) {
-            throw new CloudRuntimeException("createAccessGroup : Failed to create Igroup, invalid datastore details in the request");
+            throw new CloudRuntimeException(" Failed to create Igroup, invalid datastore details in the request");
         }
         if (accessGroup.getHostsToConnect() == null || accessGroup.getHostsToConnect().isEmpty()) {
-            throw new CloudRuntimeException("createAccessGroup : Failed to create Igroup, no hosts to connect provided in the request");
+            throw new CloudRuntimeException(" Failed to create Igroup, no hosts to connect provided in the request");
         }
 
         String igroupName = null;
@@ -202,7 +199,7 @@ public AccessGroup createAccessGroup(AccessGroup accessGroup) {
 
             // Check if all hosts support the protocol
             if (!validateProtocolSupport(accessGroup.getHostsToConnect(), protocol)) {
-                String errMsg = "createAccessGroup: Not all hosts " + " support the protocol: " + protocol.name();
+                String errMsg = " Not all hosts " + " support the protocol: " + protocol.name();
                 throw new CloudRuntimeException(errMsg);
             }
 
@@ -268,14 +265,14 @@ public void deleteAccessGroup(AccessGroup accessGroup) {
 
         if (accessGroup == null) {
             s_logger.error("deleteAccessGroup: Igroup deletion failed. Invalid request: {}", accessGroup);
-            throw new CloudRuntimeException("deleteAccessGroup : Failed to delete Igroup, invalid request");
+            throw new CloudRuntimeException(" Failed to delete Igroup, invalid request");
         }
         // Get StoragePool details
         if (accessGroup.getStoragePoolId() == null) {
-            throw new CloudRuntimeException("deleteAccessGroup : Failed to delete Igroup, invalid datastore details in the request");
+            throw new CloudRuntimeException(" Failed to delete Igroup, invalid datastore details in the request");
         }
         if (accessGroup.getHostsToConnect() == null || accessGroup.getHostsToConnect().isEmpty()) {
-            throw new CloudRuntimeException("deleteAccessGroup : Failed to delete Igroup, no hosts to connect provided in the request");
+            throw new CloudRuntimeException(" Failed to delete Igroup, no hosts to connect provided in the request");
         }
 
         try {
@@ -303,7 +300,7 @@ public void deleteAccessGroup(AccessGroup accessGroup) {
                     String igroupUuid = igroup.getUuid();
 
                     if (igroupUuid == null || igroupUuid.isEmpty()) {
-                        throw new CloudRuntimeException("deleteAccessGroup: iGroup UUID is null or empty for iGroup: " + igroupName);
+                        throw new CloudRuntimeException(" iGroup UUID is null or empty for iGroup: " + igroupName);
                     }
 
                     s_logger.info("deleteAccessGroup: Deleting iGroup '{}' with UUID '{}'", igroupName, igroupUuid);
@@ -357,13 +354,13 @@ public AccessGroup getAccessGroup(Map<String, String> values) {
         s_logger.debug("getAccessGroup : fetching Igroup with params {} ", values);
         if (values == null || values.isEmpty()) {
             s_logger.error("getAccessGroup: get Igroup failed. Invalid request: {}", values);
-            throw new CloudRuntimeException("getAccessGroup : get Igroup Failed, invalid request");
+            throw new CloudRuntimeException(" get Igroup Failed, invalid request");
         }
         String svmName = values.get(Constants.SVM_DOT_NAME);
         String igroupName = values.get(Constants.NAME);
         if (svmName == null || igroupName == null || svmName.isEmpty() || igroupName.isEmpty()) {
             s_logger.error("getAccessGroup: get Igroup failed. Invalid svm:{} or igroup name: {}", svmName, igroupName);
-            throw new CloudRuntimeException("getAccessGroup : Failed to get Igroup, invalid request");
+            throw new CloudRuntimeException(" Failed to get Igroup, invalid request");
         }
         try {
             String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
@@ -396,14 +393,14 @@ public Map<String, String> enableLogicalAccess(Map<String, String> values) {
         Map<String, String> response = null;
         if (values == null) {
             s_logger.error("enableLogicalAccess: LunMap creation failed. Invalid request values: null");
-            throw new CloudRuntimeException("enableLogicalAccess : Failed to create LunMap, invalid request");
+            throw new CloudRuntimeException(" Failed to create LunMap, invalid request");
         }
         String svmName = values.get(Constants.SVM_DOT_NAME);
         String lunName = values.get(Constants.LUN_DOT_NAME);
         String igroupName = values.get(Constants.IGROUP_DOT_NAME);
         if (svmName == null || lunName == null || igroupName == null || svmName.isEmpty() || lunName.isEmpty() || igroupName.isEmpty()) {
             s_logger.error("enableLogicalAccess: LunMap creation failed. Invalid request values: {}", values);
-            throw new CloudRuntimeException("enableLogicalAccess : Failed to create LunMap, invalid request");
+            throw new CloudRuntimeException(" Failed to create LunMap, invalid request");
         }
         try {
             // Get AuthHeader
@@ -463,13 +460,13 @@ public void disableLogicalAccess(Map<String, String> values) {
         s_logger.debug("disableLogicalAccess : Deleting LunMap with values {} ", values);
         if (values == null) {
             s_logger.error("disableLogicalAccess: LunMap deletion failed. Invalid request values: null");
-            throw new CloudRuntimeException("disableLogicalAccess : Failed to delete LunMap, invalid request");
+            throw new CloudRuntimeException(" Failed to delete LunMap, invalid request");
         }
         String lunUUID = values.get(Constants.LUN_DOT_UUID);
         String igroupUUID = values.get(Constants.IGROUP_DOT_UUID);
         if (lunUUID == null || igroupUUID == null || lunUUID.isEmpty() || igroupUUID.isEmpty()) {
             s_logger.error("disableLogicalAccess: LunMap deletion failed. Invalid request values: {}", values);
-            throw new CloudRuntimeException("disableLogicalAccess : Failed to delete LunMap, invalid request");
+            throw new CloudRuntimeException(" Failed to delete LunMap, invalid request");
         }
         try {
             String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
@@ -494,14 +491,14 @@ public Map<String, String> getLogicalAccess(Map<String, String> values) {
         s_logger.debug("getLogicalAccess : Fetching LunMap with values {} ", values);
         if (values == null) {
             s_logger.error("getLogicalAccess: Invalid request values: null");
-            throw new CloudRuntimeException("getLogicalAccess : Invalid request");
+            throw new CloudRuntimeException(" Invalid request");
         }
         String svmName = values.get(Constants.SVM_DOT_NAME);
         String lunName = values.get(Constants.LUN_DOT_NAME);
         String igroupName = values.get(Constants.IGROUP_DOT_NAME);
         if (svmName == null || lunName == null || igroupName == null || svmName.isEmpty() || lunName.isEmpty() || igroupName.isEmpty()) {
             s_logger.error("getLogicalAccess: Invalid request values: {}", values);
-            throw new CloudRuntimeException("getLogicalAccess : Invalid request");
+            throw new CloudRuntimeException(" Invalid request");
         }
         try {
             String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
@@ -553,7 +550,6 @@ public String ensureLunMapped(String svmName, String lunName, String accessGroup
         s_logger.info("ensureLunMapped: Successfully mapped LUN [{}] to igroup [{}] with LUN number [{}]", lunName, accessGroupName, response.get(Constants.LOGICAL_UNIT_NUMBER));
         return response.get(Constants.LOGICAL_UNIT_NUMBER);
     }
-    
     /**
      * Reverts a LUN to a snapshot using the ONTAP CLI-based snapshot file restore API.
      *

Original file line number	Diff line number	Diff line change
`@@ -268,16 +268,16 @@ public DataStore initialize(Map<String, Object> dsInfos) {`
`268`	`268`	`public boolean attachCluster(DataStore dataStore, ClusterScope scope) {`
`269`	`269`	`logger.debug("In attachCluster for ONTAP primary storage");`
`270`	`270`	`if (dataStore == null) {`
`271`		`- throw new InvalidParameterValueException("attachCluster: dataStore should not be null");`
	`271`	`+ throw new InvalidParameterValueException(" dataStore should not be null");`
`272`	`272`	`}`
`273`	`273`	`if (scope == null) {`
`274`		`- throw new InvalidParameterValueException("attachCluster: scope should not be null");`
	`274`	`+ throw new InvalidParameterValueException(" scope should not be null");`
`275`	`275`	`}`
`276`	`276`	`List<String> hostsIdentifier = new ArrayList<>();`
`277`	`277`	`StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId());`
`278`	`278`	`if (storagePool == null) {`
`279`	`279`	`s_logger.error("attachCluster : Storage Pool not found for id: " + dataStore.getId());`
`280`		`- throw new CloudRuntimeException("attachCluster : Storage Pool not found for id: " + dataStore.getId());`
	`280`	`+ throw new CloudRuntimeException(" Storage Pool not found for id: " + dataStore.getId());`
`281`	`281`	`}`
`282`	`282`	`PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;`
`283`	`283`	`List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInClusterForStorageConnection(primaryStore);`
`@@ -305,7 +305,7 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {`
`305`	`305`	`strategy.createAccessGroup(accessGroupRequest);`
`306`	`306`	`} catch (Exception e) {`
`307`	`307`	`s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());`
`308`		`- throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());`
	`308`	`+ throw new CloudRuntimeException("Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`}`
`@@ -332,16 +332,16 @@ public boolean attachHost(DataStore store, HostScope scope, StoragePoolInfo exis`
`332`	`332`	`public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.HypervisorType hypervisorType) {`
`333`	`333`	`logger.debug("In attachZone for ONTAP primary storage");`
`334`	`334`	`if (dataStore == null) {`
`335`		`- throw new InvalidParameterValueException("attachZone: dataStore should not be null");`
	`335`	`+ throw new InvalidParameterValueException("dataStore should not be null");`
`336`	`336`	`}`
`337`	`337`	`if (scope == null) {`
`338`		`- throw new InvalidParameterValueException("attachZone: scope should not be null");`
	`338`	`+ throw new InvalidParameterValueException("scope should not be null");`
`339`	`339`	`}`
`340`	`340`	`List<String> hostsIdentifier = new ArrayList<>();`
`341`	`341`	`StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId());`
`342`	`342`	`if (storagePool == null) {`
`343`	`343`	`s_logger.error("attachZone : Storage Pool not found for id: " + dataStore.getId());`
`344`		`- throw new CloudRuntimeException("attachZone : Storage Pool not found for id: " + dataStore.getId());`
	`344`	`+ throw new CloudRuntimeException("Storage Pool not found for id: " + dataStore.getId());`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;`
`@@ -370,7 +370,7 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper`
`370`	`370`	`strategy.createAccessGroup(accessGroupRequest);`
`371`	`371`	`} catch (Exception e) {`
`372`	`372`	`s_logger.error("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());`
`373`		`- throw new CloudRuntimeException("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());`
	`373`	`+ throw new CloudRuntimeException(" Failed to create access group on storage system for zone with Exception: " + e.getMessage());`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`}`
`@@ -393,7 +393,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host`
`393`	`393`	`for (HostVO host : hosts) {`
`394`	`394`	`if (host == null \|\| host.getStorageUrl() == null \|\| host.getStorageUrl().trim().isEmpty()`
`395`	`395`	`\|\| !host.getStorageUrl().startsWith(protocolPrefix)) {`
`396`		`- return false;`
	`396`	`+ // TODO we will inform customer through alert for excluded host because of protocol enabled on host`
	`397`	`+ continue;`
`397`	`398`	`}`
`398`	`399`	`hostIdentifiers.add(host.getStorageUrl());`
`399`	`400`	`}`
`@@ -404,7 +405,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host`
`404`	`405`	`if (host != null) {`
`405`	`406`	`ip = host.getStorageIpAddress() != null ? host.getStorageIpAddress().trim() : "";`
`406`	`407`	`if (ip.isEmpty() && host.getPrivateIpAddress() != null \|\| host.getPrivateIpAddress().trim().isEmpty()) {`
`407`		`- return false;`
	`408`	`+ // TODO we will inform customer through alert for excluded host because of protocol enabled on host`
	`409`	`+ continue;`
`408`	`410`	`} else {`
`409`	`411`	`ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;`
`410`	`412`	`}`
`@@ -413,7 +415,7 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host`
`413`	`415`	`}`
`414`	`416`	`break;`
`415`	`417`	`default:`
`416`		`- throw new CloudRuntimeException("validateProtocolSupportAndFetchHostsIdentifier : Unsupported protocol: " + protocolType.name());`
	`418`	`+ throw new CloudRuntimeException("Unsupported protocol: " + protocolType.name());`
`417`	`419`	`}`
`418`	`420`	`logger.info("validateProtocolSupportAndFetchHostsIdentifier: All hosts support the protocol: " + protocolType.name());`
`419`	`421`	`return true;`