add logs and err messages for non-guid restrictedSdcMode

dell · Feb 2, 2023 · 05ec44d · 05ec44d
1 parent 86fd202
commit 05ec44d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/service/node.go b/service/node.go
@@ -440,7 +440,7 @@ func (s *service) approveSDC(opts Opts) error {
 		}
 
 		//fetch the restrictedSdcMode
-		if system.System.RestrictedSdcModeEnabled && system.System.RestrictedSdcMode == "Guid" {
+		if system.System.RestrictedSdcMode == "Guid" {
 			if !sdc.Sdc.SdcApproved {
 				resp, err := system.ApproveSdcByGUID(sdc.Sdc.SdcGUID)
 				if err != nil {
@@ -450,7 +450,17 @@ func (s *service) approveSDC(opts Opts) error {
 			} else {
 				Log.Infof("SDC already approved, SDC GUID: %s", sdc.Sdc.SdcGUID)
 			}
+		} else {
+			if !sdc.Sdc.SdcApproved {
+				return status.Errorf(codes.FailedPrecondition,
+					"Array RestrictedSdcMode is %s, driver only supports GUID RestrictedSdcMode cannot approve SDC %s",
+					system.System.RestrictedSdcMode, sdc.Sdc.SdcGUID)
+			}
+			Log.Warnf("Array RestrictedSdcMode is %s, driver only supports GUID RestrictedSdcMode If SDC becomes restricted again, driver will not be able to approve",
+				system.System.RestrictedSdcMode)
+
 		}
+
 	}
 	return nil
 }

diff --git a/service/service.go b/service/service.go
@@ -394,9 +394,8 @@ func (s *service) BeforeServe(
 		if approveSDC == "true" {
 			opts.IsApproveSDCEnabled = true
 		}
-	} else {
-		opts.IsApproveSDCEnabled = false
 	}
+
 	if s.privDir == "" {
 		s.privDir = defaultPrivDir
 	}