Update vendor csi spec and csi-test to 1.0.0-rc2

vendor/github.com/kubernetes-csi/csi-test/mock/service/controller.go

@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 )
 
 const (
@@ -62,7 +62,7 @@ func (s *service) CreateVolume(
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 	s.vols = append(s.vols, v)
-	MockVolumes[v.Id] = Volume{
+	MockVolumes[v.GetVolumeId()] = Volume{
 		VolumeCSI:       v,
 		NodeID:          "",
 		ISStaged:        false,
@@ -108,6 +108,10 @@ func (s *service) ControllerPublishVolume(
 	req *csi.ControllerPublishVolumeRequest) (
 	*csi.ControllerPublishVolumeResponse, error) {
 
+	if s.config.DisableAttach {
+		return nil, status.Error(codes.Unimplemented, "ControllerPublish is not supported")
+	}
+
 	if len(req.VolumeId) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
 	}
@@ -136,10 +140,10 @@ func (s *service) ControllerPublishVolume(
 	devPathKey := path.Join(req.NodeId, "dev")
 
 	// Check to see if the volume is already published.
-	if device := v.Attributes[devPathKey]; device != "" {
+	if device := v.VolumeContext[devPathKey]; device != "" {
 		var volRo bool
 		var roVal string
-		if ro, ok := v.Attributes[ReadOnlyKey]; ok {
+		if ro, ok := v.VolumeContext[ReadOnlyKey]; ok {
 			roVal = ro
 		}
 
@@ -155,7 +159,7 @@ func (s *service) ControllerPublishVolume(
 		}
 
 		return &csi.ControllerPublishVolumeResponse{
-			PublishInfo: map[string]string{
+			PublishContext: map[string]string{
 				"device":   device,
 				"readonly": roVal,
 			},
@@ -171,12 +175,12 @@ func (s *service) ControllerPublishVolume(
 
 	// Publish the volume.
 	device := "/dev/mock"
-	v.Attributes[devPathKey] = device
-	v.Attributes[ReadOnlyKey] = roVal
+	v.VolumeContext[devPathKey] = device
+	v.VolumeContext[ReadOnlyKey] = roVal
 	s.vols[i] = v
 
 	return &csi.ControllerPublishVolumeResponse{
-		PublishInfo: map[string]string{
+		PublishContext: map[string]string{
 			"device":   device,
 			"readonly": roVal,
 		},
@@ -188,6 +192,10 @@ func (s *service) ControllerUnpublishVolume(
 	req *csi.ControllerUnpublishVolumeRequest) (
 	*csi.ControllerUnpublishVolumeResponse, error) {
 
+	if s.config.DisableAttach {
+		return nil, status.Error(codes.Unimplemented, "ControllerPublish is not supported")
+	}
+
 	if len(req.VolumeId) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
 	}
@@ -215,13 +223,13 @@ func (s *service) ControllerUnpublishVolume(
 	devPathKey := path.Join(nodeID, "dev")
 
 	// Check to see if the volume is already unpublished.
-	if v.Attributes[devPathKey] == "" {
+	if v.VolumeContext[devPathKey] == "" {
 		return &csi.ControllerUnpublishVolumeResponse{}, nil
 	}
 
 	// Unpublish the volume.
-	delete(v.Attributes, devPathKey)
-	delete(v.Attributes, ReadOnlyKey)
+	delete(v.VolumeContext, devPathKey)
+	delete(v.VolumeContext, ReadOnlyKey)
 	s.vols[i] = v
 
 	return &csi.ControllerUnpublishVolumeResponse{}, nil
@@ -244,7 +252,11 @@ func (s *service) ValidateVolumeCapabilities(
 	}
 
 	return &csi.ValidateVolumeCapabilitiesResponse{
-		Supported: true,
+		Confirmed: &csi.ValidateVolumeCapabilitiesResponse_Confirmed{
+			VolumeContext:      req.GetVolumeContext(),
+			VolumeCapabilities: req.GetVolumeCapabilities(),
+			Parameters:         req.GetParameters(),
+		},
 	}, nil
 }
 
@@ -338,51 +350,56 @@ func (s *service) ControllerGetCapabilities(
 	req *csi.ControllerGetCapabilitiesRequest) (
 	*csi.ControllerGetCapabilitiesResponse, error) {
 
-	return &csi.ControllerGetCapabilitiesResponse{
-		Capabilities: []*csi.ControllerServiceCapability{
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
-					},
-				},
-			},
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME,
-					},
-				},
-			},
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_LIST_VOLUMES,
-					},
-				},
-			},
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_GET_CAPACITY,
-					},
-				},
-			},
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS,
-					},
-				},
-			},
-			{
-				Type: &csi.ControllerServiceCapability_Rpc{
-					Rpc: &csi.ControllerServiceCapability_RPC{
-						Type: csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT,
-					},
+	caps := []*csi.ControllerServiceCapability{
+		{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
 				},
 			},
 		},
+		{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_LIST_VOLUMES,
+				},
+			},
+		},
+		{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_GET_CAPACITY,
+				},
+			},
+		},
+		{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS,
+				},
+			},
+		},
+		{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT,
+				},
+			},
+		},
+	}
+
+	if !s.config.DisableAttach {
+		caps = append(caps, &csi.ControllerServiceCapability{
+			Type: &csi.ControllerServiceCapability_Rpc{
+				Rpc: &csi.ControllerServiceCapability_RPC{
+					Type: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME,
+				},
+			},
+		})
+	}
+
+	return &csi.ControllerGetCapabilitiesResponse{
+		Capabilities: caps,
 	}, nil
 }
 
@@ -497,7 +514,8 @@ func getAllSnapshots(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapsh
 	// Copy the mock snapshots into a new slice in order to avoid
 	// locking the service's snapshot slice for the duration of the
 	// ListSnapshots RPC.
-	snapshots := s.snapshots.List(csi.SnapshotStatus_READY)
+	readyToUse := true
+	snapshots := s.snapshots.List(readyToUse)
 
 	var (
 		ulenSnapshots = int32(len(snapshots))

vendor/github.com/kubernetes-csi/csi-test/mock/service/identity.go

@@ -3,7 +3,7 @@ package service
 import (
 	"golang.org/x/net/context"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/protobuf/ptypes/wrappers"
 )
 
@@ -13,7 +13,7 @@ func (s *service) GetPluginInfo(
 	*csi.GetPluginInfoResponse, error) {
 
 	return &csi.GetPluginInfoResponse{
-		Name:          Name,
+		Name:          s.config.DriverName,
 		VendorVersion: VendorVersion,
 		Manifest:      Manifest,
 	}, nil

vendor/github.com/kubernetes-csi/csi-test/mock/service/node.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 )
 
 func (s *service) NodeStageVolume(
@@ -16,11 +16,15 @@ func (s *service) NodeStageVolume(
 	req *csi.NodeStageVolumeRequest) (
 	*csi.NodeStageVolumeResponse, error) {
 
-	device, ok := req.PublishInfo["device"]
+	device, ok := req.PublishContext["device"]
 	if !ok {
-		return nil, status.Error(
-			codes.InvalidArgument,
-			"stage volume info 'device' key required")
+		if s.config.DisableAttach {
+			device = "mock device"
+		} else {
+			return nil, status.Error(
+				codes.InvalidArgument,
+				"stage volume info 'device' key required")
+		}
 	}
 
 	if len(req.GetVolumeId()) == 0 {
@@ -48,14 +52,14 @@ func (s *service) NodeStageVolume(
 	nodeStgPathKey := path.Join(s.nodeID, req.StagingTargetPath)
 
 	// Check to see if the volume has already been staged.
-	if v.Attributes[nodeStgPathKey] != "" {
+	if v.VolumeContext[nodeStgPathKey] != "" {
 		// TODO: Check for the capabilities to be equal. Return "ALREADY_EXISTS"
 		// if the capabilities don't match.
 		return &csi.NodeStageVolumeResponse{}, nil
 	}
 
 	// Stage the volume.
-	v.Attributes[nodeStgPathKey] = device
+	v.VolumeContext[nodeStgPathKey] = device
 	s.vols[i] = v
 
 	return &csi.NodeStageVolumeResponse{}, nil
@@ -87,12 +91,12 @@ func (s *service) NodeUnstageVolume(
 	nodeStgPathKey := path.Join(s.nodeID, req.StagingTargetPath)
 
 	// Check to see if the volume has already been unstaged.
-	if v.Attributes[nodeStgPathKey] == "" {
+	if v.VolumeContext[nodeStgPathKey] == "" {
 		return &csi.NodeUnstageVolumeResponse{}, nil
 	}
 
 	// Unpublish the volume.
-	delete(v.Attributes, nodeStgPathKey)
+	delete(v.VolumeContext, nodeStgPathKey)
 	s.vols[i] = v
 
 	return &csi.NodeUnstageVolumeResponse{}, nil
@@ -103,11 +107,15 @@ func (s *service) NodePublishVolume(
 	req *csi.NodePublishVolumeRequest) (
 	*csi.NodePublishVolumeResponse, error) {
 
-	device, ok := req.PublishInfo["device"]
+	device, ok := req.PublishContext["device"]
 	if !ok {
-		return nil, status.Error(
-			codes.InvalidArgument,
-			"publish volume info 'device' key required")
+		if s.config.DisableAttach {
+			device = "mock device"
+		} else {
+			return nil, status.Error(
+				codes.InvalidArgument,
+				"stage volume info 'device' key required")
+		}
 	}
 
 	if len(req.GetVolumeId()) == 0 {
@@ -135,7 +143,7 @@ func (s *service) NodePublishVolume(
 	nodeMntPathKey := path.Join(s.nodeID, req.TargetPath)
 
 	// Check to see if the volume has already been published.
-	if v.Attributes[nodeMntPathKey] != "" {
+	if v.VolumeContext[nodeMntPathKey] != "" {
 
 		// Requests marked Readonly fail due to volumes published by
 		// the Mock driver supporting only RW mode.
@@ -148,9 +156,9 @@ func (s *service) NodePublishVolume(
 
 	// Publish the volume.
 	if req.GetStagingTargetPath() != "" {
-		v.Attributes[nodeMntPathKey] = req.GetStagingTargetPath()
+		v.VolumeContext[nodeMntPathKey] = req.GetStagingTargetPath()
 	} else {
-		v.Attributes[nodeMntPathKey] = device
+		v.VolumeContext[nodeMntPathKey] = device
 	}
 	s.vols[i] = v
 
@@ -182,27 +190,17 @@ func (s *service) NodeUnpublishVolume(
 	nodeMntPathKey := path.Join(s.nodeID, req.TargetPath)
 
 	// Check to see if the volume has already been unpublished.
-	if v.Attributes[nodeMntPathKey] == "" {
+	if v.VolumeContext[nodeMntPathKey] == "" {
 		return &csi.NodeUnpublishVolumeResponse{}, nil
 	}
 
 	// Unpublish the volume.
-	delete(v.Attributes, nodeMntPathKey)
+	delete(v.VolumeContext, nodeMntPathKey)
 	s.vols[i] = v
 
 	return &csi.NodeUnpublishVolumeResponse{}, nil
 }
 
-func (s *service) NodeGetId(
-	ctx context.Context,
-	req *csi.NodeGetIdRequest) (
-	*csi.NodeGetIdResponse, error) {
-
-	return &csi.NodeGetIdResponse{
-		NodeId: s.nodeID,
-	}, nil
-}
-
 func (s *service) NodeGetCapabilities(
 	ctx context.Context,
 	req *csi.NodeGetCapabilitiesRequest) (
@@ -230,7 +228,17 @@ func (s *service) NodeGetCapabilities(
 
 func (s *service) NodeGetInfo(ctx context.Context,
 	req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
-	return &csi.NodeGetInfoResponse{
+	csiNodeResponse := &csi.NodeGetInfoResponse{
 		NodeId: s.nodeID,
-	}, nil
+	}
+	if s.config.AttachLimit > 0 {
+		csiNodeResponse.MaxVolumesPerNode = s.config.AttachLimit
+	}
+	return csiNodeResponse, nil
+}
+
+func (s *service) NodeGetVolumeStats(ctx context.Context,
+	req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
+	return &csi.NodeGetVolumeStatsResponse{}, nil
+
 }

vendor/github.com/kubernetes-csi/csi-test/mock/service/service.go

@@ -5,11 +5,12 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"time"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-test/mock/cache"
 	"golang.org/x/net/context"
+
+	"github.com/golang/protobuf/ptypes"
 )
 
 const (
@@ -25,6 +26,12 @@ var Manifest = map[string]string{
 	"url": "https://github.com/kubernetes-csi/csi-test/mock",
 }
 
+type Config struct {
+	DisableAttach bool
+	DriverName    string
+	AttachLimit   int64
+}
+
 // Service is the CSI Mock service provider.
 type Service interface {
 	csi.ControllerServer
@@ -40,6 +47,7 @@ type service struct {
 	volsNID      uint64
 	snapshots    cache.SnapshotCache
 	snapshotsNID uint64
+	config       Config
 }
 
 type Volume struct {
@@ -55,8 +63,11 @@ type Volume struct {
 var MockVolumes map[string]Volume
 
 // New returns a new Service.
-func New() Service {
-	s := &service{nodeID: Name}
+func New(config Config) Service {
+	s := &service{
+		nodeID: config.DriverName,
+		config: config,
+	}
 	s.snapshots = cache.NewSnapshotCache()
 	s.vols = []csi.Volume{
 		s.newVolume("Mock Volume 1", gib100),
@@ -83,8 +94,8 @@ const (
 
 func (s *service) newVolume(name string, capcity int64) csi.Volume {
 	return csi.Volume{
-		Id:            fmt.Sprintf("%d", atomic.AddUint64(&s.volsNID, 1)),
-		Attributes:    map[string]string{"name": name},
+		VolumeId:      fmt.Sprintf("%d", atomic.AddUint64(&s.volsNID, 1)),
+		VolumeContext: map[string]string{"name": name},
 		CapacityBytes: capcity,
 	}
 }
@@ -101,11 +112,11 @@ func (s *service) findVolNoLock(k, v string) (volIdx int, volInfo csi.Volume) {
 	for i, vi := range s.vols {
 		switch k {
 		case "id":
-			if strings.EqualFold(v, vi.Id) {
+			if strings.EqualFold(v, vi.GetVolumeId()) {
 				return i, vi
 			}
 		case "name":
-			if n, ok := vi.Attributes["name"]; ok && strings.EqualFold(v, n) {
+			if n, ok := vi.VolumeContext["name"]; ok && strings.EqualFold(v, n) {
 				return i, vi
 			}
 		}
@@ -121,17 +132,16 @@ func (s *service) findVolByName(
 }
 
 func (s *service) newSnapshot(name, sourceVolumeId string, parameters map[string]string) cache.Snapshot {
+
+	ptime := ptypes.TimestampNow()
 	return cache.Snapshot{
 		Name:       name,
 		Parameters: parameters,
 		SnapshotCSI: csi.Snapshot{
-			Id:             fmt.Sprintf("%d", atomic.AddUint64(&s.snapshotsNID, 1)),
-			CreatedAt:      time.Now().UnixNano(),
+			SnapshotId:     fmt.Sprintf("%d", atomic.AddUint64(&s.snapshotsNID, 1)),
+			CreationTime:   ptime,
 			SourceVolumeId: sourceVolumeId,
-			Status: &csi.SnapshotStatus{
-				Type:    csi.SnapshotStatus_READY,
-				Details: "snapshot ready",
-			},
+			ReadyToUse:     true,
 		},
 	}
 }