kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 01:45:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

csi: ClientCSIControllerPublish* -> ClientCSIControllerAttach*

Browse Source
This commit is contained in:
Danielle Lancashire
2019-12-17 12:37:33 +01:00
committed by Tim Gross
parent 964ede4301
commit 19d06d5bb2
3 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/client_csi_endpoint.go
View File

@@ -28,9 +28,15 @@ var (
ErrPluginTypeError = errors.New("CSI Plugin loaded incorrectly")
)
// CSIControllerPublishVolume is used to attach a volume from a CSI Cluster to
// CSIControllerAttachVolume is used to attach a volume from a CSI Cluster to
// the storage node provided in the request.
func (c *ClientCSI) CSIControllerPublishVolume(req *structs.ClientCSIControllerPublishVolumeRequest, resp *structs.ClientCSIControllerPublishVolumeResponse) error {
//
// The controller attachment flow currently works as follows:
// 1. Validate the volume request
// 2. Call ControllerPublishVolume on the CSI Plugin to trigger a remote attachment
//
// In the future this may be expanded to request dynamic secrets for attachement.
func (c *ClientCSI) CSIControllerAttachVolume(req *structs.ClientCSIControllerAttachVolumeRequest, resp *structs.ClientCSIControllerAttachVolumeResponse) error {
defer metrics.MeasureSince([]string{"client", "csi_controller", "publish_volume"}, time.Now())
client, err := c.findControllerPlugin(req.PluginName)
if err != nil {

55
client/client_csi_endpoint_test.go
View File

@@ -17,47 +17,70 @@ var fakePlugin = &dynamicplugins.PluginInfo{
ConnectionInfo: &dynamicplugins.PluginConnectionInfo{},
}
func TestClientCSI_CSIControllerPublishVolume(t *testing.T) {
func TestClientCSI_CSIControllerAttachVolume(t *testing.T) {
t.Parallel()
cases := []struct {
Name string
ClientSetupFunc func(*fake.Client)
Request *structs.ClientCSIControllerPublishVolumeRequest
Request *structs.ClientCSIControllerAttachVolumeRequest
ExpectedErr error
ExpectedResponse *structs.ClientCSIControllerPublishVolumeResponse
ExpectedResponse *structs.ClientCSIControllerAttachVolumeResponse
}{
{
Name: "returns plugin not found errors",
Request: &structs.ClientCSIControllerPublishVolumeRequest{
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: "some-garbage",
},
ExpectedErr: errors.New("plugin some-garbage for type csi-controller not found"),
},
{
Name: "validates volumeid is not empty",
Request: &structs.ClientCSIControllerPublishVolumeRequest{
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
},
ExpectedErr: errors.New("VolumeID is required"),
},
{
Name: "validates nodeid is not empty",
Request: &structs.ClientCSIControllerPublishVolumeRequest{
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
},
ExpectedErr: errors.New("NodeID is required"),
},
{
Name: "validates AccessMode",
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
AccessMode: structs.CSIVolumeAccessMode("foo"),
},
ExpectedErr: errors.New("Unknown access mode: foo"),
},
{
Name: "validates attachmentmode is not empty",
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
AccessMode: structs.CSIVolumeAccessModeMultiNodeReader,
AttachmentMode: structs.CSIVolumeAttachmentMode("bar"),
},
ExpectedErr: errors.New("Unknown attachment mode: bar"),
},
{
Name: "returns transitive errors",
ClientSetupFunc: func(fc *fake.Client) {
fc.NextControllerPublishVolumeErr = errors.New("hello")
},
Request: &structs.ClientCSIControllerPublishVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
AccessMode: structs.CSIVolumeAccessModeSingleNodeWriter,
AttachmentMode: structs.CSIVolumeAttachmentModeFilesystem,
},
ExpectedErr: errors.New("hello"),
},
@@ -66,12 +89,12 @@ func TestClientCSI_CSIControllerPublishVolume(t *testing.T) {
ClientSetupFunc: func(fc *fake.Client) {
fc.NextControllerPublishVolumeResponse = &csi.ControllerPublishVolumeResponse{}
},
Request: &structs.ClientCSIControllerPublishVolumeRequest{
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
},
ExpectedResponse: &structs.ClientCSIControllerPublishVolumeResponse{},
ExpectedResponse: &structs.ClientCSIControllerAttachVolumeResponse{},
},
{
Name: "handles non-nil PublishContext",
@@ -80,12 +103,12 @@ func TestClientCSI_CSIControllerPublishVolume(t *testing.T) {
PublishContext: map[string]string{"foo": "bar"},
}
},
Request: &structs.ClientCSIControllerPublishVolumeRequest{
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
},
ExpectedResponse: &structs.ClientCSIControllerPublishVolumeResponse{
ExpectedResponse: &structs.ClientCSIControllerAttachVolumeResponse{
PublishContext: map[string]string{"foo": "bar"},
},
},
@@ -110,8 +133,8 @@ func TestClientCSI_CSIControllerPublishVolume(t *testing.T) {
err := client.dynamicRegistry.RegisterPlugin(fakePlugin)
require.Nil(err)
var resp structs.ClientCSIControllerPublishVolumeResponse
err = client.ClientRPC("ClientCSI.CSIControllerPublishVolume", tc.Request, &resp)
var resp structs.ClientCSIControllerAttachVolumeResponse
err = client.ClientRPC("ClientCSI.CSIControllerAttachVolume", tc.Request, &resp)
require.Equal(tc.ExpectedErr, err)
if tc.ExpectedResponse != nil {
require.Equal(tc.ExpectedResponse, &resp)

6
client/structs/csi.go
View File

@@ -64,7 +64,7 @@ type CSIVolumeMountOptions struct {
MountFlags []string
}
type ClientCSIControllerPublishVolumeRequest struct {
type ClientCSIControllerAttachVolumeRequest struct {
PluginName string
// The ID of the volume to be used on a node.
@@ -91,7 +91,7 @@ type ClientCSIControllerPublishVolumeRequest struct {
ReadOnly bool
}
func (c *ClientCSIControllerPublishVolumeRequest) ToCSIRequest() *csi.ControllerPublishVolumeRequest {
func (c *ClientCSIControllerAttachVolumeRequest) ToCSIRequest() *csi.ControllerPublishVolumeRequest {
if c == nil {
return &csi.ControllerPublishVolumeRequest{}
}
@@ -103,7 +103,7 @@ func (c *ClientCSIControllerPublishVolumeRequest) ToCSIRequest() *csi.Controller
}
}
type ClientCSIControllerPublishVolumeResponse struct {
type ClientCSIControllerAttachVolumeResponse struct {
// Opaque static publish properties of the volume. SP MAY use this
// field to ensure subsequent `NodeStageVolume` or `NodePublishVolume`
// calls calls have contextual information.