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

Fixes for drivers with STAGE_UNSTAGE_VOLUME capability #53

Merged
merged 1 commit into from
Mar 15, 2018
Merged

Fixes for drivers with STAGE_UNSTAGE_VOLUME capability #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions cmd/csi-sanity/sanity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ const (
)

var (
VERSION = "(dev)"
endpoint string
mountPoint string
version bool
VERSION = "(dev)"
endpoint string
mountDir string
version bool
)

func init() {
flag.StringVar(&endpoint, prefix+"endpoint", "", "CSI endpoint")
flag.BoolVar(&version, prefix+"version", false, "Version of this program")
flag.StringVar(&mountPoint, prefix+"mountpoint", os.TempDir()+"/csi", "Mount point for NodePublish")
flag.StringVar(&mountDir, prefix+"mountdir", os.TempDir()+"/csi", "Mount point for NodePublish")
flag.Parse()
}

Expand All @@ -50,5 +50,5 @@ func TestSanity(t *testing.T) {
if len(endpoint) == 0 {
t.Fatalf("--%sendpoint must be provided with an CSI endpoint", prefix)
}
sanity.Test(t, endpoint, mountPoint)
sanity.Test(t, endpoint, mountDir)
}
14 changes: 7 additions & 7 deletions pkg/sanity/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func verifyVolumeInfo(v *csi.Volume) {
Expect(v.GetId()).NotTo(BeEmpty())
}

func isCapabilitySupported(
func isControllerCapabilitySupported(
c csi.ControllerClient,
capType csi.ControllerServiceCapability_RPC_Type,
) bool {
Expand Down Expand Up @@ -97,7 +97,7 @@ var _ = Describe("GetCapacity [Controller Server]", func() {
BeforeEach(func() {
c = csi.NewControllerClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_GET_CAPACITY) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_GET_CAPACITY) {
Skip("GetCapacity not supported")
}
})
Expand All @@ -121,7 +121,7 @@ var _ = Describe("ListVolumes [Controller Server]", func() {
BeforeEach(func() {
c = csi.NewControllerClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_LIST_VOLUMES) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_LIST_VOLUMES) {
Skip("ListVolumes not supported")
}
})
Expand Down Expand Up @@ -152,7 +152,7 @@ var _ = Describe("CreateVolume [Controller Server]", func() {
BeforeEach(func() {
c = csi.NewControllerClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
Skip("CreateVolume not supported")
}
})
Expand Down Expand Up @@ -419,7 +419,7 @@ var _ = Describe("DeleteVolume [Controller Server]", func() {
BeforeEach(func() {
c = csi.NewControllerClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
Skip("DeleteVolume not supported")
}
})
Expand Down Expand Up @@ -585,7 +585,7 @@ var _ = Describe("ControllerPublishVolume [Controller Server]", func() {
c = csi.NewControllerClient(conn)
n = csi.NewNodeClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
Skip("ControllerPublishVolume not supported")
}
})
Expand Down Expand Up @@ -715,7 +715,7 @@ var _ = Describe("ControllerUnpublishVolume [Controller Server]", func() {
c = csi.NewControllerClient(conn)
n = csi.NewNodeClient(conn)

if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
Skip("ControllerUnpublishVolume not supported")
}
})
Expand Down
Loading