Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make probe universal #18

Merged
merged 3 commits into from
Nov 2, 2018
Merged

Make probe universal #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
631f2c3
Make probe universal
sbezverk Nov 1, 2018
7a0c618
Fix unit test
sbezverk Nov 1, 2018
9c40863
Address comments
sbezverk Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions cmd/livenessprobe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,23 @@ func createMockServer(t *testing.T) (
}

func TestProbe(t *testing.T) {
mockController, driver, idServer, _, nodeServer, csiConn, err := createMockServer(t)
mockController, driver, idServer, _, _, csiConn, err := createMockServer(t)
if err != nil {
t.Fatal(err)
}
defer mockController.Finish()
defer driver.Stop()
defer csiConn.Close()

var injectedErr error

// Setting up expected calls' responses
inPlugin := &csi.GetPluginInfoRequest{}
outPlugin := &csi.GetPluginInfoResponse{
Name: "foo/bar",
}
var injectedErr error
idServer.EXPECT().GetPluginInfo(gomock.Any(), inPlugin).Return(outPlugin, injectedErr).Times(1)

inNode := &csi.NodeGetIdRequest{}
outNode := &csi.NodeGetIdResponse{
NodeId: "test_node_id",
}
nodeServer.EXPECT().NodeGetId(gomock.Any(), inNode).Return(outNode, injectedErr).Times(1)
inProbe := &csi.ProbeRequest{}
outProbe := &csi.ProbeResponse{}
idServer.EXPECT().Probe(gomock.Any(), inProbe).Return(outProbe, injectedErr).Times(1)
Expand Down
10 changes: 0 additions & 10 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,13 @@ var (
)

func runProbe(ctx context.Context, csiConn connection.CSIConnection) error {

// Get CSI driver name.
glog.Infof("Calling CSI driver to discover driver name.")
csiDriverName, err := csiConn.GetDriverName(ctx)
if err != nil {
return err
}
glog.Infof("CSI driver name: %q", csiDriverName)

// Get CSI Driver Node ID
glog.Infof("Calling CSI driver to discover node ID.")
csiDriverNodeID, err := csiConn.NodeGetId(ctx)
if err != nil {
return err
}
glog.Infof("CSI driver node ID: %q", csiDriverNodeID)

// Sending Probe request
glog.Infof("Sending probe request to CSI driver.")
if err := csiConn.LivenessProbe(ctx); err != nil {
Expand Down
19 changes: 0 additions & 19 deletions pkg/connection/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ type CSIConnection interface {
// call.
GetDriverName(ctx context.Context) (string, error)

// NodeGetId returns node ID of the current according to the CSI driver.
NodeGetId(ctx context.Context) (string, error)

// Liveness Probe
LivenessProbe(ctx context.Context) error

Expand Down Expand Up @@ -126,22 +123,6 @@ func (c *csiConnection) LivenessProbe(ctx context.Context) error {
return nil
}

func (c *csiConnection) NodeGetId(ctx context.Context) (string, error) {
client := csi.NewNodeClient(c.conn)

req := csi.NodeGetIdRequest{}

rsp, err := client.NodeGetId(ctx, &req)
if err != nil {
return "", err
}
nodeID := rsp.GetNodeId()
if nodeID == "" {
return "", fmt.Errorf("node ID is empty")
}
return nodeID, nil
}

func (c *csiConnection) Close() error {
return c.conn.Close()
}
Expand Down