CSTACKEX-46 resolve check style issues

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -145,8 +145,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(DataStore dataStore, VolumeInfo volumeObject) {

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 { }
-
 }

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

@@ -339,8 +339,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());
@@ -406,8 +406,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 {

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

@@ -27,10 +27,7 @@
 import org.apache.cloudstack.storage.feign.client.SANFeignClient;
 import org.apache.cloudstack.storage.feign.model.Igroup;
 import org.apache.cloudstack.storage.feign.model.Initiator;
-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.Svm;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
 import org.apache.cloudstack.storage.service.model.AccessGroup;
@@ -389,9 +386,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);

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

@@ -146,7 +146,7 @@ public static String generateExportPolicyName(String svmName, String volumeName)
     }
 
     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;
     }