Snapshot License cache fix

service/features/snapshot.feature

@@ -6,27 +6,32 @@ Feature: PowerMax CSI Interface
     Scenario: Snapshot license
         Given a PowerMax service
         When I check the snapshot license
-        And I reset the license cache
         Then no error was received
+        And the snapshot license cache has "1" array
+        And I reset the license cache
+        And the snapshot license cache has "0" array
 @v1.2.0
     Scenario: Snapshot license for unlicensed array
         Given a PowerMax service
         And I induce error "SnapshotNotLicensed"
         When I check the snapshot license
+        And the snapshot license cache has "1" array
         And I reset the license cache
         Then the error contains "doesn't have Snapshot license"
 @v1.2.0
     Scenario: Check snapshot license but receive error
         Given a PowerMax service
         And I induce error "InvalidResponse"
         When I check the snapshot license
+        And the snapshot license cache has "0" array
         And I reset the license cache
         Then the error contains "induced error"
 @v1.2.0
     Scenario: Check snapshot but get unisphere mismatch
         Given a PowerMax service
         And I induce error "UnisphereMismatchError"
         When I check the snapshot license
+        And the snapshot license cache has "0" array
         And I reset the license cache
         Then the error contains "not being managed by Unisphere"
 @v1.2.0

service/snap.go

@@ -1,5 +1,5 @@
 /*
- Copyright © 2021 Dell Inc. or its subsidiaries. All Rights Reserved.
+ Copyright © 2021-2024 Dell Inc. or its subsidiaries. All Rights Reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -43,8 +43,7 @@ const (
 
 var (
 	cleanupStarted      = false
-	licenseCached       = false
-	symmRepCapabilities *types.SymReplicationCapabilities
+	symmRepCapabilities = make(map[string]types.SymmetrixCapability)
 	mutex               sync.Mutex
 	snapCleaner         *snapCleanupWorker
 )
@@ -175,31 +174,41 @@ func (s *service) UnlinkTargets(ctx context.Context, symID, srcDevID string, pma
 	return nil
 }
 
-// IsSnapshotLicensed return true if the symmetrix array has
-// SnapVX license
+// This function checks if the PowerMax array has the SnapVX license.
+// It returns an error if the array does not meet the expectations.
 func (s *service) IsSnapshotLicensed(ctx context.Context, symID string, pmaxClient pmax.Pmax) (err error) {
 	if _, err := pmaxClient.IsAllowedArray(symID); err != nil {
 		return err
 	}
 	mutex.Lock()
 	defer mutex.Unlock()
-	if licenseCached == false {
-		symmRepCapabilities, err = pmaxClient.GetReplicationCapabilities(ctx)
+
+	symmRepCapability, ok := symmRepCapabilities[symID]
+	if !ok {
+		repCapabilities, err := pmaxClient.GetReplicationCapabilities(ctx)
 		if err != nil {
 			return err
 		}
-		licenseCached = true
-		log.Infof("License information with Powermax %s is cached", symID)
-	}
-	for i := range symmRepCapabilities.SymmetrixCapability {
-		if symmRepCapabilities.SymmetrixCapability[i].SymmetrixID == symID {
-			if symmRepCapabilities.SymmetrixCapability[i].SnapVxCapable {
-				return nil
+
+		for _, symmCapability := range repCapabilities.SymmetrixCapability {
+			if symmCapability.SymmetrixID == symID {
+				symmRepCapabilities[symID] = symmCapability
+				log.Infof("License information with PowerMax %s is cached", symID)
+				break
 			}
-			return fmt.Errorf("PowerMax array (%s) doesn't have Snapshot license", symID)
+		}
+
+		symmRepCapability, ok = symmRepCapabilities[symID]
+		if !ok {
+			return fmt.Errorf("PowerMax array (%s) is not being managed by Unisphere", symID)
 		}
 	}
-	return fmt.Errorf("PowerMax array (%s) is not being managed by Unisphere", symID)
+
+	if symmRepCapability.SnapVxCapable {
+		return nil
+	}
+
+	return fmt.Errorf("PowerMax array (%s) doesn't have Snapshot license", symID)
 }
 
 // UnlinkAndTerminate executes cleanup operation on the source/target volume

service/step_defs_test.go

@@ -3928,9 +3928,18 @@ func (f *feature) noVolumeSource() error {
 	return nil
 }
 
+func (f *feature) validateSnapshotLicenseCache(count int) error {
+	if len(symmRepCapabilities) != count {
+		return fmt.Errorf("Expected %d array(s) in the license cache but got %d", count, len(symmRepCapabilities))
+	}
+	return nil
+}
+
 func (f *feature) iResetTheLicenseCache() error {
-	licenseCached = false
-	symmRepCapabilities = nil
+	for k := range symmRepCapabilities {
+		delete(symmRepCapabilities, k)
+	}
+
 	return nil
 }
 
@@ -5143,6 +5152,7 @@ func FeatureContext(s *godog.ScenarioContext) {
 	s.Step(`^a valid DeleteSnapshotResponse is returned$`, f.aValidDeleteSnapshotResponseIsReturned)
 	s.Step(`^a non-existent volume$`, f.aNonexistentVolume)
 	s.Step(`^no volume source$`, f.noVolumeSource)
+	s.Step(`^the snapshot license cache has "(\d+)" array$`, f.validateSnapshotLicenseCache)
 	s.Step(`^I reset the license cache$`, f.iResetTheLicenseCache)
 	s.Step(`^I call IsSnapshotSource$`, f.iCallIsSnapshotSource)
 	s.Step(`^IsSnapshotSource returns "([^"]*)"$`, f.isSnapshotSourceReturns)