mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated vednor files

Browse Source
This commit is contained in:
Serguei Bezverkhi
2018-02-15 08:50:31 -05:00
parent 18a4ce4439
commit 1f1e8cea37
3299 changed files with 834 additions and 1051200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/controllerserver-default.go generated vendored
View File

@ -90,6 +90,11 @@ func (cs *DefaultControllerServer) ControllerProbe(ctx context.Context, req *csi
func (cs *DefaultControllerServer) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
glog.V(5).Infof("Using default ControllerGetCapabilities")
// Check arguments
if req.GetVersion() == nil {
return nil, status.Error(codes.InvalidArgument, "Version missing in request")
}
return &csi.ControllerGetCapabilitiesResponse{
Capabilities: cs.Driver.cap,
}, nil

8
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/driver_test.go generated vendored
View File

@ -33,10 +33,10 @@ const (
var (
fakeVersion = csi.Version{Major: 5, Minor: 2, Patch: 0}
fakeVersionsSupported = []*csi.Version{
&csi.Version{
{
Major: 4, Minor: 0, Patch: 0,
},
&csi.Version{
{
Major: 4, Minor: 1, Patch: 0,
},
}
@ -45,10 +45,10 @@ var (
func NewFakeDriver() *CSIDriver {
fakeVersion = csi.Version{Major: 5, Minor: 2, Patch: 0}
fakeVersionsSupported = []*csi.Version{
&csi.Version{
{
Major: 4, Minor: 0, Patch: 0,
},
&csi.Version{
{
Major: 4, Minor: 1, Patch: 0,
},
}

18
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/nodeserver-default.go generated vendored
View File

@ -44,15 +44,15 @@ func (ns *DefaultNodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.N
return nil, status.Error(codes.Unimplemented, "")
}
func (ns *DefaultNodeServer) GetNodeID(ctx context.Context, req *csi.GetNodeIDRequest) (*csi.GetNodeIDResponse, error) {
glog.V(5).Infof("Using default GetNodeID")
func (ns *DefaultNodeServer) NodeGetId(ctx context.Context, req *csi.NodeGetIdRequest) (*csi.NodeGetIdResponse, error) {
glog.V(5).Infof("Using default NodeGetId")
err := ns.Driver.CheckVersion(req.GetVersion())
if err != nil {
return nil, err
}
return &csi.GetNodeIDResponse{
return &csi.NodeGetIdResponse{
NodeId: ns.Driver.nodeID,
}, nil
}
@ -76,5 +76,15 @@ func (ns *DefaultNodeServer) NodeGetCapabilities(ctx context.Context, req *csi.N
return nil, err
}
return &csi.NodeGetCapabilitiesResponse{}, nil
return &csi.NodeGetCapabilitiesResponse{
Capabilities: []*csi.NodeServiceCapability{
{
Type: &csi.NodeServiceCapability_Rpc{
Rpc: &csi.NodeServiceCapability_RPC{
Type: csi.NodeServiceCapability_RPC_UNKNOWN,
},
},
},
},
}, nil
}

8
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/nodeserver-default_test.go generated vendored
View File

@ -26,21 +26,21 @@ import (
"google.golang.org/grpc/status"
)
func TestGetNodeID(t *testing.T) {
func TestNodeGetId(t *testing.T) {
d := NewFakeDriver()
ns := NewDefaultNodeServer(d)
// Test invalid request
req := csi.GetNodeIDRequest{}
_, err := ns.GetNodeID(context.Background(), &req)
req := csi.NodeGetIdRequest{}
_, err := ns.NodeGetId(context.Background(), &req)
s, ok := status.FromError(err)
assert.True(t, ok)
assert.Equal(t, s.Code(), codes.InvalidArgument)
// Test valid request
req.Version = &fakeVersion
resp, err := ns.GetNodeID(context.Background(), &req)
resp, err := ns.NodeGetId(context.Background(), &req)
assert.NoError(t, err)
assert.Equal(t, resp.GetNodeId(), fakeNodeID)
}

2
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/utils.go generated vendored
View File

@ -41,7 +41,7 @@ func GetVersionString(v *csi.Version) string {
}
func GetVersionFromString(v string) (*csi.Version, error) {
var major, minor, patch uint32
var major, minor, patch int32
n, err := fmt.Sscanf(v, "%d.%d.%d", &major, &minor, &patch)
if err != nil {

6
vendor/github.com/kubernetes-csi/drivers/pkg/csi-common/utils_test.go generated vendored
View File

@ -31,9 +31,9 @@ func TestGetVersionFromString(t *testing.T) {
v, err := GetVersionFromString("1.2.3")
assert.NoError(t, err)
assert.Equal(t, v.GetMajor(), uint32(1))
assert.Equal(t, v.GetMinor(), uint32(2))
assert.Equal(t, v.GetPatch(), uint32(3))
assert.Equal(t, v.GetMajor(), int32(1))
assert.Equal(t, v.GetMinor(), int32(2))
assert.Equal(t, v.GetPatch(), int32(3))
// Invalid version
_, err = GetVersionFromString("1.2")