Increase Code Coverage

Makefile

@@ -62,7 +62,7 @@ push:	docker
 
 # Run unit tests and skip the BDD tests
 unit-test: golint check
-	( cd service; go clean -cache; CGO_ENABLED=0 GO111MODULE=on go test -skip TestGoDog -v -coverprofile=c.out ./... )
+	( cd service; go clean -cache; CGO_ENABLED=0 GO111MODULE=on go test -v -coverprofile=c.out ./... )
 
 # Run BDD tests. Need to be root to run as tests require some system access, need to fix
 bdd-test: golint check

csireverseproxy/manifests/revproxy.yaml

@@ -73,7 +73,7 @@
             - name: X_CSI_REVPROXY_TLS_CERT_DIR
               value: /app/tls
             - name: X_CSI_REVPROXY_WATCH_NAMESPACE
-              value: powermax #Change this to the namespace where proxy will be installed
+              value: powermax # Change this to the namespace where proxy will be installed
           volumeMounts:
             - name: configmap-volume
               mountPath: /etc/config/configmap

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/dell/gofsutil v1.17.0
 	github.com/dell/goiscsi v1.10.0
 	github.com/dell/gonvme v1.9.0
-	github.com/dell/gopowermax/v2 v2.8.0
+	github.com/dell/gopowermax/v2 v2.8.1-0.20241125093918-928d66cb1027
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gorilla/mux v1.7.3
 	github.com/kubernetes-csi/csi-lib-utils v0.7.0
@@ -50,6 +50,7 @@ require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-memdb v1.3.4 // indirect

go.sum

@@ -112,8 +112,8 @@ github.com/dell/goiscsi v1.10.0 h1:0U24YZ2aEbjdvcMCx4x8GcXwwonDUwpCjAFP5QJiiXs=
 github.com/dell/goiscsi v1.10.0/go.mod h1:uDXlWSh0w5BdLr5XhPKUyNpkJDTc0jmnz/u6QcPkIyA=
 github.com/dell/gonvme v1.9.0 h1:r/Gs88+NUKypDwyyoL8wzcx9zsqyVbea+oDnA/PPmiI=
 github.com/dell/gonvme v1.9.0/go.mod h1:5IgWNLcuffHzuXSa6YH3APHiET/hROouuj3mg7GPoqQ=
-github.com/dell/gopowermax/v2 v2.8.0 h1:skBPhCDDio4CU9naxJrAytXWQarDZGtLsOhyUtAFfuM=
-github.com/dell/gopowermax/v2 v2.8.0/go.mod h1:LAwLBmN44WT/u1ixPf2M0cTXzsMwIFZ6NcTyC0gwvXA=
+github.com/dell/gopowermax/v2 v2.8.1-0.20241125093918-928d66cb1027 h1:RE5VVC+ZcW+RdVm1P7ZcqFfKc71Xh1xrdVEHddvOSgo=
+github.com/dell/gopowermax/v2 v2.8.1-0.20241125093918-928d66cb1027/go.mod h1:LAwLBmN44WT/u1ixPf2M0cTXzsMwIFZ6NcTyC0gwvXA=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=

pkg/migration/migration.go

@@ -78,7 +78,7 @@ func getOrCreateSGMigration(ctx context.Context, symID, remoteSymID, storageGrou
 // 1. Remove volumes from default SRP SG
 // 2. Create migration session for no-srp SG
 // 3. Create default SRP storage group on remote array, and maintain a list of volumes to be added.
-func StorageGroupMigration(ctx context.Context, symID, remoteSymID, clusterPrefix string, pmaxClient pmax.Pmax) (bool, error) {
+var StorageGroupMigration = func(ctx context.Context, symID, remoteSymID, clusterPrefix string, pmaxClient pmax.Pmax) (bool, error) {
 	// Before running no-srp-sg migrate call, remove the volumes from srp SG
 	// for all the SG for this cluster on local sym ID
 	localSgList, err := pmaxClient.GetStorageGroupIDList(ctx, symID, CsiVolumePrefix+clusterPrefix, true)
@@ -178,7 +178,7 @@ func StorageGroupMigration(ctx context.Context, symID, remoteSymID, clusterPrefi
 
 // StorageGroupCommit does a "commit" on all the migration session SG
 // Returns true if not sessions found, all migration completed
-func StorageGroupCommit(ctx context.Context, symID, action string, pmaxClient pmax.Pmax) (bool, error) {
+var StorageGroupCommit = func(ctx context.Context, symID, action string, pmaxClient pmax.Pmax) (bool, error) {
 	// for all the SG in saved local SG
 	mgSGList, err := pmaxClient.GetStorageGroupMigration(ctx, symID)
 	if err != nil {
@@ -206,7 +206,7 @@ func StorageGroupCommit(ctx context.Context, symID, action string, pmaxClient pm
 }
 
 // AddVolumesToRemoteSG adds remote volumes to default SRP SG on remote array
-func AddVolumesToRemoteSG(ctx context.Context, remoteSymID string, pmaxClient pmax.Pmax) (bool, error) {
+var AddVolumesToRemoteSG = func(ctx context.Context, remoteSymID string, pmaxClient pmax.Pmax) (bool, error) {
 	// add all the volumes in SGtoRemoteVols
 	log.Debugf("SGToRemoteVols: %v", SGToRemoteVols)
 	if len(SGToRemoteVols) == 0 {
@@ -227,7 +227,7 @@ func AddVolumesToRemoteSG(ctx context.Context, remoteSymID string, pmaxClient pm
 }
 
 // GetOrCreateMigrationEnvironment creates migration environment between array pair
-func GetOrCreateMigrationEnvironment(ctx context.Context, localSymID, remoteSymID string, pmaxClient pmax.Pmax) (*types.MigrationEnv, error) {
+var GetOrCreateMigrationEnvironment = func(ctx context.Context, localSymID, remoteSymID string, pmaxClient pmax.Pmax) (*types.MigrationEnv, error) {
 	var migrationEnv *types.MigrationEnv
 	migrationEnv, err := pmaxClient.GetMigrationEnvironment(ctx, localSymID, remoteSymID)
 	if err != nil || migrationEnv == nil {

samples/configmap/powermax-array-config.yaml

@@ -17,7 +17,7 @@ metadata:
   namespace: powermax
 data:
   powermax-array-config.yaml: |
-    X_CSI_POWERMAX_PORTGROUPS: "" # required for ISCSI 
+    X_CSI_POWERMAX_PORTGROUPS: "" # required for ISCSI
     X_CSI_TRANSPORT_PROTOCOL: "" # Defaults to auto
     X_CSI_POWERMAX_ENDPOINT: "https://10.0.0.0:1234"
     X_CSI_MANAGED_ARRAYS: "000000000000,000000000000,"

samples/storageclass/powermax.yaml

@@ -47,19 +47,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"

samples/storageclass/powermax_fc.yaml

@@ -38,19 +38,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"
@@ -88,4 +88,3 @@ allowedTopologies:
       - key: csi-powermax.dellemc.com/<SYMID>.fc
         values:
           - csi-powermax.dellemc.com
-

samples/storageclass/powermax_iscsi.yaml

@@ -38,19 +38,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"

samples/storageclass/powermax_nfs.yaml

@@ -54,19 +54,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"

samples/storageclass/powermax_nvmetcp.yaml

@@ -38,19 +38,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"

samples/storageclass/powermax_srdf.yaml

@@ -16,7 +16,7 @@ metadata:
 parameters:
   #######################
   # k8s/driver attributes
-  #######################  
+  #######################
   # "csi.storage.k8s.io/fstype" is used to set the filesystem type which will be used to format the new volume
   # Allowed values:
   #   "ext4" - EXT4 File system
@@ -51,19 +51,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
   ########################
   # CSM module attributes
   # ######################

samples/storageclass/powermax_vsphere.yaml

@@ -38,19 +38,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"

samples/storageclass/powermax_xfs.yaml

@@ -35,19 +35,19 @@ parameters:
   # This is used in naming storage group, max of 3 letter
   # Optional: true
   # Example: "HL1", "HL2"
-  #HostLimitName: "HL1"
+  # HostLimitName: "HL1"
   # The MBs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitMBSec: ""
+  # HostIOLimitMBSec: ""
   # The IOs per Second Host IO limit for the storage class
   # Optional: true, Default: ""
   # Examples: 100, 200, NOLIMIT
-  #HostIOLimitIOSec: ""
+  # HostIOLimitIOSec: ""
   # distribution of the Host IO limits for the storage class
   # Optional: true, Default: ""
   # Allowed values: Never","Always" or "OnFailure" only
-  #DynamicDistribution: ""
+  # DynamicDistribution: ""
 # If using custom driver name, change the following to point to the custom name
 # Optional: true, Default value: csi-powermax.dellemc.com
 # Examples: "csi-driver-powermax", "csi-powermax.dellemc.com"