Fixed spotty CanSupport for PV and added more unit tests for same

This commit is contained in:
markturansky
2015-05-23 09:53:33 -04:00
parent fe84643ccd
commit 3ad583cf2d
7 changed files with 19 additions and 1 deletions

View File

@@ -53,7 +53,7 @@ func (plugin *RBDPlugin) Name() string {
}
func (plugin *RBDPlugin) CanSupport(spec *volume.Spec) bool {
if spec.VolumeSource.RBD == nil {
if spec.VolumeSource.RBD == nil && spec.PersistentVolumeSource.RBD == nil {
return false
}
// see if rbd is there

View File

@@ -37,6 +37,9 @@ func TestCanSupport(t *testing.T) {
if plug.Name() != "kubernetes.io/rbd" {
t.Errorf("Wrong name: %s", plug.Name())
}
if plug.CanSupport(&volume.Spec{Name: "foo", VolumeSource: api.VolumeSource{}}) {
t.Errorf("Expected false")
}
}
type fakeDiskManager struct{}