Merge pull request #15 from msau42/more-access-modes

Add more access modes to volume capabilities

pkg/nfs/nfs.go

@@ -31,7 +31,7 @@ type nfsDriver struct {
 
 	//ids *identityServer
 	ns    *nodeServer
-	cap   []*csi.VolumeCapability_AccessMode
+	cap   map[csi.VolumeCapability_AccessMode_Mode]bool
 	cscap []*csi.ControllerServiceCapability
 }
 
@@ -51,9 +51,18 @@ func NewNFSdriver(nodeID, endpoint string) *nfsDriver {
 		version:  version,
 		nodeID:   nodeID,
 		endpoint: endpoint,
+		cap:      map[csi.VolumeCapability_AccessMode_Mode]bool{},
 	}
 
-	n.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER})
+	vcam := []csi.VolumeCapability_AccessMode_Mode{
+		csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+		csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY,
+		csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
+		csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
+		csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
+	}
+	n.AddVolumeCapabilityAccessModes(vcam)
+
 	// NFS plugin does not support ControllerServiceCapability now.
 	// If support is added, it should set to appropriate
 	// ControllerServiceCapability RPC types.
@@ -86,8 +95,8 @@ func (n *nfsDriver) AddVolumeCapabilityAccessModes(vc []csi.VolumeCapability_Acc
 	for _, c := range vc {
 		glog.Infof("Enabling volume access mode: %v", c.String())
 		vca = append(vca, &csi.VolumeCapability_AccessMode{Mode: c})
+		n.cap[c] = true
 	}
-	n.cap = vca
 	return vca
 }