Updated vednor files

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/README.md

@@ -39,8 +39,8 @@ by using the result of the above command.
 $ sudo ./_output/cinderplugin --endpoint tcp://127.0.0.1:10000 --cloud-config /etc/cloud.conf --nodeid CSINodeID
 ```
 
-### Test
-Get ```csc``` tool from https://github.com/chakri-nelluri/gocsi/tree/master/csc
+### Test using csc
+Get ```csc``` tool from https://github.com/thecodeteam/gocsi/tree/master/csc
 
 #### Get plugin info
 ```

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/controllerserver.go

@@ -68,7 +68,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	glog.V(4).Infof("Create volume %s in Availability Zone: %s", resID, resAvailability)
 
 	return &csi.CreateVolumeResponse{
-		VolumeInfo: &csi.VolumeInfo{
+		Volume: &csi.Volume{
 			Id: resID,
 			Attributes: map[string]string{
 				"availability": resAvailability,
@@ -137,7 +137,7 @@ func (cs *controllerServer) ControllerPublishVolume(ctx context.Context, req *cs
 	pvInfo["DevicePath"] = devicePath
 
 	return &csi.ControllerPublishVolumeResponse{
-		PublishVolumeInfo: pvInfo,
+		PublishInfo: pvInfo,
 	}, nil
 }
 

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/controllerserver_test.go

@@ -61,11 +61,11 @@ func TestCreateVolume(t *testing.T) {
 	}
 
 	// Assert
-	assert.NotNil(actualRes.VolumeInfo)
+	assert.NotNil(actualRes.Volume)
 
-	assert.NotEqual(0, len(actualRes.VolumeInfo.Id), "Volume Id is nil")
+	assert.NotEqual(0, len(actualRes.Volume.Id), "Volume Id is nil")
 
-	assert.Equal(fakeAvailability, actualRes.VolumeInfo.Attributes["availability"])
+	assert.Equal(fakeAvailability, actualRes.Volume.Attributes["availability"])
 }
 
 // Test DeleteVolume
@@ -126,7 +126,7 @@ func TestControllerPublishVolume(t *testing.T) {
 
 	// Expected Result
 	expectedRes := &csi.ControllerPublishVolumeResponse{
-		PublishVolumeInfo: map[string]string{
+		PublishInfo: map[string]string{
 			"DevicePath": fakeDevicePath,
 		},
 	}

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/fake.go

@@ -26,7 +26,7 @@ var fakeConfig = "/etc/cloud.conf"
 var fakeCtx = context.Background()
 var fakeVolName = "CSIVolumeName"
 var fakeVolID = "CSIVolumeID"
-var fakeVolType = "lvmdriver-1"
-var fakeAvailability = "nova"
+var fakeVolType = ""
+var fakeAvailability = ""
 var fakeDevicePath = "/dev/xxx"
 var fakeTargetPath = "/mnt/cinder"

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/nodeserver.go

@@ -31,7 +31,7 @@ type nodeServer struct {
 	*csicommon.DefaultNodeServer
 }
 
-func (ns *nodeServer) GetNodeID(ctx context.Context, req *csi.GetNodeIDRequest) (*csi.GetNodeIDResponse, error) {
+func (ns *nodeServer) NodeGetId(ctx context.Context, req *csi.NodeGetIdRequest) (*csi.NodeGetIdResponse, error) {
 
 	// Get Mount Provider
 	m, err := mount.GetMountProvider()
@@ -47,20 +47,20 @@ func (ns *nodeServer) GetNodeID(ctx context.Context, req *csi.GetNodeIDRequest)
 	}
 
 	if len(nodeID) > 0 {
-		return &csi.GetNodeIDResponse{
+		return &csi.NodeGetIdResponse{
 			NodeId: nodeID,
 		}, nil
 	}
 
 	// Using default function
-	return ns.DefaultNodeServer.GetNodeID(ctx, req)
+	return ns.DefaultNodeServer.NodeGetId(ctx, req)
 }
 
 func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
 
 	targetPath := req.GetTargetPath()
 	fsType := req.GetVolumeCapability().GetMount().GetFsType()
-	devicePath := req.GetPublishVolumeInfo()["DevicePath"]
+	devicePath := req.GetPublishInfo()["DevicePath"]
 
 	// Get Mount Provider
 	m, err := mount.GetMountProvider()

vendor/github.com/kubernetes-csi/drivers/pkg/cinder/nodeserver_test.go

@@ -35,8 +35,8 @@ func init() {
 	}
 }
 
-// Test GetNodeID
-func TestGetNodeID(t *testing.T) {
+// Test NodeGetId
+func TestNodeGetId(t *testing.T) {
 
 	// mock MountMock
 	mmock := new(mount.MountMock)
@@ -48,19 +48,19 @@ func TestGetNodeID(t *testing.T) {
 	assert := assert.New(t)
 
 	// Expected Result
-	expectedRes := &csi.GetNodeIDResponse{
+	expectedRes := &csi.NodeGetIdResponse{
 		NodeId: fakeNodeID,
 	}
 
 	// Fake request
-	fakeReq := &csi.GetNodeIDRequest{
+	fakeReq := &csi.NodeGetIdRequest{
 		Version: &version,
 	}
 
-	// Invoke GetNodeID
-	actualRes, err := fakeNs.GetNodeID(fakeCtx, fakeReq)
+	// Invoke NodeGetId
+	actualRes, err := fakeNs.NodeGetId(fakeCtx, fakeReq)
 	if err != nil {
-		t.Errorf("failed to GetNodeID: %v", err)
+		t.Errorf("failed to NodeGetId: %v", err)
 	}
 
 	// Assert
@@ -88,12 +88,12 @@ func TestNodePublishVolume(t *testing.T) {
 
 	// Fake request
 	fakeReq := &csi.NodePublishVolumeRequest{
-		Version:           &version,
-		VolumeId:          fakeVolID,
-		PublishVolumeInfo: map[string]string{"DevicePath": fakeDevicePath},
-		TargetPath:        fakeTargetPath,
-		VolumeCapability:  nil,
-		Readonly:          false,
+		Version:          &version,
+		VolumeId:         fakeVolID,
+		PublishInfo:      map[string]string{"DevicePath": fakeDevicePath},
+		TargetPath:       fakeTargetPath,
+		VolumeCapability: nil,
+		Readonly:         false,
 	}
 
 	// Invoke NodePublishVolume