cbae10333c
This changeset corrects handling of the `ValidationVolumeCapabilities` response: * The CSI spec for the `ValidationVolumeCapabilities` requires that plugins only set the `Confirmed` field if they've validated all capabilities. The Nomad client improperly assumes that the lack of a `Confirmed` field should be treated as a failure. This breaks the Azure and Linode block storage plugins, which don't set this optional field. * The CSI spec also requires that the orchestrator check the validation responses to guard against older versions of a plugin reporting "valid" for newer fields it doesn't understand.
132 lines
5.3 KiB
Go
132 lines
5.3 KiB
Go
package testing
|
|
|
|
import (
|
|
"context"
|
|
|
|
csipbv1 "github.com/container-storage-interface/spec/lib/go/csi"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
// IdentityClient is a CSI identity client used for testing
|
|
type IdentityClient struct {
|
|
NextErr error
|
|
NextPluginInfo *csipbv1.GetPluginInfoResponse
|
|
NextPluginCapabilities *csipbv1.GetPluginCapabilitiesResponse
|
|
NextPluginProbe *csipbv1.ProbeResponse
|
|
}
|
|
|
|
// NewIdentityClient returns a new IdentityClient
|
|
func NewIdentityClient() *IdentityClient {
|
|
return &IdentityClient{}
|
|
}
|
|
|
|
func (f *IdentityClient) Reset() {
|
|
f.NextErr = nil
|
|
f.NextPluginInfo = nil
|
|
f.NextPluginCapabilities = nil
|
|
f.NextPluginProbe = nil
|
|
}
|
|
|
|
// GetPluginInfo returns plugin info
|
|
func (f *IdentityClient) GetPluginInfo(ctx context.Context, in *csipbv1.GetPluginInfoRequest, opts ...grpc.CallOption) (*csipbv1.GetPluginInfoResponse, error) {
|
|
return f.NextPluginInfo, f.NextErr
|
|
}
|
|
|
|
// GetPluginCapabilities implements csi method
|
|
func (f *IdentityClient) GetPluginCapabilities(ctx context.Context, in *csipbv1.GetPluginCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.GetPluginCapabilitiesResponse, error) {
|
|
return f.NextPluginCapabilities, f.NextErr
|
|
}
|
|
|
|
// Probe implements csi method
|
|
func (f *IdentityClient) Probe(ctx context.Context, in *csipbv1.ProbeRequest, opts ...grpc.CallOption) (*csipbv1.ProbeResponse, error) {
|
|
return f.NextPluginProbe, f.NextErr
|
|
}
|
|
|
|
// ControllerClient is a CSI controller client used for testing
|
|
type ControllerClient struct {
|
|
NextErr error
|
|
NextCapabilitiesResponse *csipbv1.ControllerGetCapabilitiesResponse
|
|
NextPublishVolumeResponse *csipbv1.ControllerPublishVolumeResponse
|
|
NextUnpublishVolumeResponse *csipbv1.ControllerUnpublishVolumeResponse
|
|
NextValidateVolumeCapabilitiesResponse *csipbv1.ValidateVolumeCapabilitiesResponse
|
|
}
|
|
|
|
// NewControllerClient returns a new ControllerClient
|
|
func NewControllerClient() *ControllerClient {
|
|
return &ControllerClient{}
|
|
}
|
|
|
|
func (f *ControllerClient) Reset() {
|
|
f.NextErr = nil
|
|
f.NextCapabilitiesResponse = nil
|
|
f.NextPublishVolumeResponse = nil
|
|
f.NextUnpublishVolumeResponse = nil
|
|
f.NextValidateVolumeCapabilitiesResponse = nil
|
|
}
|
|
|
|
func (c *ControllerClient) ControllerGetCapabilities(ctx context.Context, in *csipbv1.ControllerGetCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.ControllerGetCapabilitiesResponse, error) {
|
|
return c.NextCapabilitiesResponse, c.NextErr
|
|
}
|
|
|
|
func (c *ControllerClient) ControllerPublishVolume(ctx context.Context, in *csipbv1.ControllerPublishVolumeRequest, opts ...grpc.CallOption) (*csipbv1.ControllerPublishVolumeResponse, error) {
|
|
return c.NextPublishVolumeResponse, c.NextErr
|
|
}
|
|
|
|
func (c *ControllerClient) ControllerUnpublishVolume(ctx context.Context, in *csipbv1.ControllerUnpublishVolumeRequest, opts ...grpc.CallOption) (*csipbv1.ControllerUnpublishVolumeResponse, error) {
|
|
return c.NextUnpublishVolumeResponse, c.NextErr
|
|
}
|
|
|
|
func (c *ControllerClient) ValidateVolumeCapabilities(ctx context.Context, in *csipbv1.ValidateVolumeCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.ValidateVolumeCapabilitiesResponse, error) {
|
|
return c.NextValidateVolumeCapabilitiesResponse, c.NextErr
|
|
}
|
|
|
|
// NodeClient is a CSI Node client used for testing
|
|
type NodeClient struct {
|
|
NextErr error
|
|
NextCapabilitiesResponse *csipbv1.NodeGetCapabilitiesResponse
|
|
NextGetInfoResponse *csipbv1.NodeGetInfoResponse
|
|
NextStageVolumeResponse *csipbv1.NodeStageVolumeResponse
|
|
NextUnstageVolumeResponse *csipbv1.NodeUnstageVolumeResponse
|
|
NextPublishVolumeResponse *csipbv1.NodePublishVolumeResponse
|
|
NextUnpublishVolumeResponse *csipbv1.NodeUnpublishVolumeResponse
|
|
}
|
|
|
|
// NewNodeClient returns a new stub NodeClient
|
|
func NewNodeClient() *NodeClient {
|
|
return &NodeClient{}
|
|
}
|
|
|
|
func (f *NodeClient) Reset() {
|
|
f.NextErr = nil
|
|
f.NextCapabilitiesResponse = nil
|
|
f.NextGetInfoResponse = nil
|
|
f.NextStageVolumeResponse = nil
|
|
f.NextUnstageVolumeResponse = nil
|
|
f.NextPublishVolumeResponse = nil
|
|
f.NextUnpublishVolumeResponse = nil
|
|
}
|
|
|
|
func (c *NodeClient) NodeGetCapabilities(ctx context.Context, in *csipbv1.NodeGetCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.NodeGetCapabilitiesResponse, error) {
|
|
return c.NextCapabilitiesResponse, c.NextErr
|
|
}
|
|
|
|
func (c *NodeClient) NodeGetInfo(ctx context.Context, in *csipbv1.NodeGetInfoRequest, opts ...grpc.CallOption) (*csipbv1.NodeGetInfoResponse, error) {
|
|
return c.NextGetInfoResponse, c.NextErr
|
|
}
|
|
|
|
func (c *NodeClient) NodeStageVolume(ctx context.Context, in *csipbv1.NodeStageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeStageVolumeResponse, error) {
|
|
return c.NextStageVolumeResponse, c.NextErr
|
|
}
|
|
|
|
func (c *NodeClient) NodeUnstageVolume(ctx context.Context, in *csipbv1.NodeUnstageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeUnstageVolumeResponse, error) {
|
|
return c.NextUnstageVolumeResponse, c.NextErr
|
|
}
|
|
|
|
func (c *NodeClient) NodePublishVolume(ctx context.Context, in *csipbv1.NodePublishVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodePublishVolumeResponse, error) {
|
|
return c.NextPublishVolumeResponse, c.NextErr
|
|
}
|
|
|
|
func (c *NodeClient) NodeUnpublishVolume(ctx context.Context, in *csipbv1.NodeUnpublishVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeUnpublishVolumeResponse, error) {
|
|
return c.NextUnpublishVolumeResponse, c.NextErr
|
|
}
|