Merge pull request kubernetes-csi#171 from jarrpa/expand-cli

 Add volume expansion online/offline toggle to mock driver

cmd/mock-driver/main.go

@@ -35,6 +35,7 @@ func main() {
 	flag.Int64Var(&config.AttachLimit, "attach-limit", 0, "number of attachable volumes on a node")
 	flag.BoolVar(&config.NodeExpansionRequired, "node-expand-required", false, "Enables NodeServiceCapability_RPC_EXPAND_VOLUME capacity.")
 	flag.BoolVar(&config.DisableControllerExpansion, "disable-controller-expansion", false, "Disables ControllerServiceCapability_RPC_EXPAND_VOLUME capability.")
+	flag.BoolVar(&config.DisableOnlineExpansion, "disable-online-expansion", false, "Disables online volume expansion capability.")
 	flag.Parse()
 
 	endpoint := os.Getenv("CSI_ENDPOINT")

mock/service/controller.go

@@ -498,6 +498,10 @@ func (s *service) ControllerExpandVolume(
 		return nil, status.Error(codes.NotFound, req.VolumeId)
 	}
 
+	if s.config.DisableOnlineExpansion && MockVolumes[v.GetVolumeId()].ISPublished {
+		return nil, status.Error(codes.Aborted, "volume is published and online volume expansion is not supported")
+	}
+
 	requestBytes := req.CapacityRange.RequiredBytes
 
 	if v.CapacityBytes > requestBytes {

mock/service/identity.go

@@ -34,6 +34,12 @@ func (s *service) GetPluginCapabilities(
 	req *csi.GetPluginCapabilitiesRequest) (
 	*csi.GetPluginCapabilitiesResponse, error) {
 
+	volExpType := csi.PluginCapability_VolumeExpansion_ONLINE
+
+	if s.config.DisableOnlineExpansion {
+		volExpType = csi.PluginCapability_VolumeExpansion_OFFLINE
+	}
+
 	return &csi.GetPluginCapabilitiesResponse{
 		Capabilities: []*csi.PluginCapability{
 			{
@@ -43,6 +49,13 @@ func (s *service) GetPluginCapabilities(
 					},
 				},
 			},
+			{
+				Type: &csi.PluginCapability_VolumeExpansion_{
+					VolumeExpansion: &csi.PluginCapability_VolumeExpansion{
+						Type: volExpType,
+					},
+				},
+			},
 		},
 	}, nil
 }

mock/service/service.go

@@ -32,6 +32,7 @@ type Config struct {
 	AttachLimit                int64
 	NodeExpansionRequired      bool
 	DisableControllerExpansion bool
+	DisableOnlineExpansion     bool
 }
 
 // Service is the CSI Mock service provider.

pkg/sanity/identity.go

@@ -49,11 +49,23 @@ var _ = DescribeSanity("Identity Service", func(sc *SanityContext) {
 			By("checking successful response")
 			Expect(res.GetCapabilities()).NotTo(BeNil())
 			for _, cap := range res.GetCapabilities() {
-				switch cap.GetService().GetType() {
-				case csi.PluginCapability_Service_CONTROLLER_SERVICE:
-				case csi.PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS:
+				switch cap.GetType().(type) {
+				case *csi.PluginCapability_Service_:
+					switch cap.GetService().GetType() {
+					case csi.PluginCapability_Service_CONTROLLER_SERVICE:
+					case csi.PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS:
+					default:
+						Fail(fmt.Sprintf("Unknown service: %v\n", cap.GetService().GetType()))
+					}
+				case *csi.PluginCapability_VolumeExpansion_:
+					switch cap.GetVolumeExpansion().GetType() {
+					case csi.PluginCapability_VolumeExpansion_ONLINE:
+					case csi.PluginCapability_VolumeExpansion_OFFLINE:
+					default:
+						Fail(fmt.Sprintf("Unknown volume expansion mode: %v\n", cap.GetVolumeExpansion().GetType()))
+					}
 				default:
-					Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetService().GetType()))
+					Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetType()))
 				}
 			}
 

pkg/sanity/node.go

@@ -60,8 +60,7 @@ func isPluginCapabilitySupported(c csi.IdentityClient,
 	Expect(caps.GetCapabilities()).NotTo(BeNil())
 
 	for _, cap := range caps.GetCapabilities() {
-		Expect(cap.GetService()).NotTo(BeNil())
-		if cap.GetService().GetType() == capType {
+		if cap.GetService() != nil && cap.GetService().GetType() == capType {
 			return true
 		}
 	}