CSTACKEX-46 resolve check style issues

Gupta, Surya · Gupta, Surya · commit 241d7f14d629 · 2025-11-10T18:03:08.000+05:30
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
@@ -143,8 +143,7 @@ public  boolean isValidName(String name) {
             return false;
         }
         // Regex: Starts with a letter, followed by letters, digits, or underscores
-        String regex = "^[a-zA-Z][a-zA-Z0-9_]*$";
-        return name.matches(regex);
+        return name.matches(Constants.ONTAP_NAME_REGEX);
     }
 
     private String createCloudStackVolumeForTypeVolume(StoragePoolVO storagePool, VolumeInfo volumeInfo) {
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java
@@ -42,4 +42,3 @@ public interface VolumeFeignClient {
     @Headers({"Accept: {acceptHeader}", "Authorization: {authHeader}"})
     JobResponse updateVolumeRebalancing(@Param("acceptHeader") String acceptHeader, @Param("uuid") String uuid, Volume volumeRequest);
 }
-
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Svm.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Svm.java
@@ -143,5 +143,4 @@ public int hashCode() {
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class Links { }
-
-}
+}
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
@@ -285,8 +285,8 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
                 AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);
                 strategy.createAccessGroup(accessGroupRequest);
             } catch (Exception e) {
-                s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId(), e);
-                throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId(), e);
+                s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage(), e);
+                throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage(), e);
             }
         }
         logger.debug("attachCluster: Attaching the pool to each of the host in the cluster: {}", primaryStore.getClusterId());
@@ -335,8 +335,13 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
             throw new CloudRuntimeException(errMsg);
         }
         if (hostsIdentifier != null && !hostsIdentifier.isEmpty()) {
-            AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);
-            strategy.createAccessGroup(accessGroupRequest);
+            try {
+                AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);
+                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());
+            }
         }
         for (HostVO host : hostsToConnect) {
             try {
@@ -461,4 +466,3 @@ public void changeStoragePoolScopeToCluster(DataStore store, ClusterScope cluste
 
     }
 }
-
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
@@ -22,10 +22,7 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.feign.FeignClientFactory;
 import org.apache.cloudstack.storage.feign.client.SANFeignClient;
-import org.apache.cloudstack.storage.feign.model.Igroup;
-import org.apache.cloudstack.storage.feign.model.Lun;
-import org.apache.cloudstack.storage.feign.model.LunMap;
-import org.apache.cloudstack.storage.feign.model.OntapStorage;
+import org.apache.cloudstack.storage.feign.model.*;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
 import org.apache.cloudstack.storage.service.model.AccessGroup;
 import org.apache.cloudstack.storage.service.model.CloudStackVolume;
@@ -224,9 +221,17 @@ public void enableLogicalAccess(Map<String, String> values) {
             String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
             // Create LunMap
             LunMap lunMapRequest = new LunMap();
-            lunMapRequest.getSvm().setName(svmName);
-            lunMapRequest.getLun().setName(lunName);
-            lunMapRequest.getIgroup().setName(igroupName);
+            Svm svm = new Svm();
+            svm.setName(svmName);
+            lunMapRequest.setSvm(svm);
+            //Set Lun name
+            Lun lun = new Lun();
+            lun.setName(lunName);
+            lunMapRequest.setLun(lun);
+            //Set Igroup name
+            Igroup igroup = new Igroup();
+            igroup.setName(igroupName);
+            lunMapRequest.setIgroup(igroup);
             OntapResponse<LunMap> createdLunMap = sanFeignClient.createLunMap(authHeader, true, lunMapRequest);
             if (createdLunMap == null || createdLunMap.getRecords() == null || createdLunMap.getRecords().size() == 0) {
                 s_logger.error("enableLogicalAccess: LunMap failed for Lun: {} and igroup: {}", lunName, igroupName);
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java
@@ -56,6 +56,7 @@ public class Constants {
 
     public static final String VOLUME_PATH_PREFIX = "/vol/";
 
+    public static final String ONTAP_NAME_REGEX = "^[a-zA-Z][a-zA-Z0-9_]*$";
     public static final String KVM = "KVM";
 
     public static final String HTTPS = "https://";
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java
@@ -83,7 +83,7 @@ public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String
     }
 
     public static String getLunName(String volName, String lunName) {
-        //LUN name in ONTAP unified : "/vol/VolumeName/LunName"
+        //LUN name in ONTAP unified format: "/vol/VolumeName/LunName"
         return Constants.VOLUME_PATH_PREFIX + volName + Constants.SLASH + lunName;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,7 @@ public boolean isValidName(String name) {`
`143`	`143`	`return false;`
`144`	`144`	`}`
`145`	`145`	`// Regex: Starts with a letter, followed by letters, digits, or underscores`
`146`		`- String regex = "^[a-zA-Z][a-zA-Z0-9_]*$";`
`147`		`- return name.matches(regex);`
	`146`	`+ return name.matches(Constants.ONTAP_NAME_REGEX);`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`private String createCloudStackVolumeForTypeVolume(StoragePoolVO storagePool, VolumeInfo volumeInfo) {`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,3 @@ public interface VolumeFeignClient {`
`42`	`42`	`@Headers({"Accept: {acceptHeader}", "Authorization: {authHeader}"})`
`43`	`43`	`JobResponse updateVolumeRebalancing(@Param("acceptHeader") String acceptHeader, @Param("uuid") String uuid, Volume volumeRequest);`
`44`	`44`	`}`
`45`		`-`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {`
`285`	`285`	`AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);`
`286`	`286`	`strategy.createAccessGroup(accessGroupRequest);`
`287`	`287`	`} catch (Exception e) {`
`288`		`- s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId(), e);`
`289`		`- throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId(), e);`
	`288`	`+ s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage(), e);`
	`289`	`+ throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage(), e);`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`logger.debug("attachCluster: Attaching the pool to each of the host in the cluster: {}", primaryStore.getClusterId());`
`@@ -335,8 +335,13 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper`
`335`	`335`	`throw new CloudRuntimeException(errMsg);`
`336`	`336`	`}`
`337`	`337`	`if (hostsIdentifier != null && !hostsIdentifier.isEmpty()) {`
`338`		`- AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);`
`339`		`- strategy.createAccessGroup(accessGroupRequest);`
	`338`	`+ try {`
	`339`	`+ AccessGroup accessGroupRequest = createAccessGroupRequestByProtocol(storagePool, scope.getScopeId(), details, hostsIdentifier);`
	`340`	`+ strategy.createAccessGroup(accessGroupRequest);`
	`341`	`+ } catch (Exception e) {`
	`342`	`+ s_logger.error("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());`
	`343`	`+ throw new CloudRuntimeException("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());`
	`344`	`+ }`
`340`	`345`	`}`
`341`	`346`	`for (HostVO host : hostsToConnect) {`
`342`	`347`	`try {`
`@@ -461,4 +466,3 @@ public void changeStoragePoolScopeToCluster(DataStore store, ClusterScope cluste`
`461`	`466`
`462`	`467`	`}`
`463`	`468`	`}`
`464`		`-`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public static String getLunName(String volName, String lunName) {`
`86`		`- //LUN name in ONTAP unified : "/vol/VolumeName/LunName"`
	`86`	`+ //LUN name in ONTAP unified format: "/vol/VolumeName/LunName"`
`87`	`87`	`return Constants.VOLUME_PATH_PREFIX + volName + Constants.SLASH + lunName;`
`88`	`88`	`}`
`89`	`89`