Add a new field for ControllerPublish'd state

kubernetes-csi · May 6, 2020 · bf51384 · bf51384
1 parent 639e97d
commit bf51384
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/mock/service/controller.go b/mock/service/controller.go
@@ -228,7 +228,7 @@ func (s *service) ControllerPublishVolume(
 	s.vols[i] = v
 
 	if volInfo, ok := MockVolumes[req.VolumeId]; ok {
-		volInfo.ISPublished = true
+		volInfo.ISControllerPublished = true
 		MockVolumes[req.VolumeId] = volInfo
 	}
 
@@ -628,7 +628,7 @@ func (s *service) ControllerExpandVolume(
 		return nil, status.Error(codes.NotFound, req.VolumeId)
 	}
 
-	if s.config.DisableOnlineExpansion && MockVolumes[v.GetVolumeId()].ISPublished {
+	if s.config.DisableOnlineExpansion && MockVolumes[v.GetVolumeId()].ISControllerPublished {
 		return nil, status.Error(codes.Aborted, "volume is published and online volume expansion is not supported")
 	}
 

diff --git a/mock/service/service.go b/mock/service/service.go
@@ -109,13 +109,14 @@ type service struct {
 }
 
 type Volume struct {
-	VolumeCSI       csi.Volume
-	NodeID          string
-	ISStaged        bool
-	ISPublished     bool
-	ISEphemeral     bool
-	StageTargetPath string
-	TargetPath      string
+	VolumeCSI             csi.Volume
+	NodeID                string
+	ISStaged              bool
+	ISPublished           bool
+	ISEphemeral           bool
+	ISControllerPublished bool
+	StageTargetPath       string
+	TargetPath            string
 }
 
 var MockVolumes map[string]Volume