Enable Sanity Testing

Gopkg.toml

@@ -53,6 +53,10 @@
   name = "k8s.io/kubernetes"
   version = "v1.13.0"
 
+[[override]]
+  name = "gopkg.in/fsnotify.v1"
+  source = "https://github.com/fsnotify/fsnotify.git"
+
 [[override]]
   version = "kubernetes-1.13.0"
   name = "k8s.io/api"

Makefile

@@ -28,6 +28,8 @@ test:
 	go vet github.com/csi-driver/azuredisk-csi-driver/pkg/...
 integration-test:
 	test/integration/run-tests-all-clouds.sh
+test-sanity:
+	go test -v ./test/sanity/...
 azuredisk:
 	if [ ! -d ./vendor ]; then dep ensure -vendor-only; fi
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X github.com/csi-driver/azuredisk-csi-driver/pkg/azuredisk.vendorVersion=$(IMAGE_VERSION) -extldflags "-static"' -o _output/azurediskplugin ./pkg/azurediskplugin

pkg/azuredisk/controllerserver.go

@@ -72,8 +72,17 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		return nil, status.Error(codes.InvalidArgument, "Volume capabilities not supported")
 	}
 
-	volSizeBytes := int64(req.GetCapacityRange().GetRequiredBytes())
-	requestGiB := int(util.RoundUpSize(volSizeBytes, 1024*1024*1024))
+	volSizeBytes := int64(util.GIB)
+	if req.GetCapacityRange() != nil {
+		volSizeBytes = req.GetCapacityRange().GetRequiredBytes()
+	}
+
+	requestGiB := int(util.RoundUpSize(volSizeBytes, util.GIB))
+
+	maxVolSize := int(req.GetCapacityRange().GetLimitBytes())
+	if (maxVolSize > 0) && (maxVolSize < requestGiB) {
+		return nil, status.Error(codes.InvalidArgument, "After round-up, volume size exceeds the limit specified")
+	}
 
 	var (
 		location, account  string

test/sanity/README.md

@@ -0,0 +1,18 @@
+## Sanity Tests
+Testing the Azure Disk CSI driver using the [`sanity`](https://github.com/kubernetes-csi/csi-test/tree/master/pkg/sanity) package test suite.
+
+## Run Integration Tests Locally
+### Prerequisite
+ - make sure `GOPATH` is set
+
+ - set the environment variable AZURE_CREDENTIAL_FILE with the path to cloud provider config file only if you have the file at a different location than `/etc/kubernetes/azure.json`
+ > By default Cloud provider config file is present at `/etc/kubernetes/azure.json` on a kubernetes cluster node
+```
+export set AZURE_CREDENTIAL_FILE=
+```
+
+### Run integration tests
+```
+make test-sanity
+```
+

test/sanity/sanity_test.go

@@ -0,0 +1,48 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sanity
+
+import (
+	"testing"
+
+	sanity "github.com/kubernetes-csi/csi-test/pkg/sanity"
+
+	azuredisk "github.com/csi-driver/azuredisk-csi-driver/pkg/azuredisk"
+)
+
+const (
+	mountPath = "/tmp/csi/mount"
+	stagePath = "/tmp/csi/stage"
+	socket    = "/tmp/csi.sock"
+	endpoint  = "unix://" + socket
+)
+
+func TestSanity(t *testing.T) {
+	ddriver := azuredisk.NewDriver("someNodeID")
+
+	go func() {
+		ddriver.Run(endpoint)
+	}()
+
+	// Run test
+	config := &sanity.Config{
+		TargetPath:  mountPath,
+		StagingPath: stagePath,
+		Address:     endpoint,
+	}
+	sanity.Test(t, config)
+}