github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Use const instead of hard code for volume plugin

Browse Source
This commit is contained in:
xiangpengzhao 2017-09-18 20:09:07 +08:00
parent 93ddb7be5f
commit 39a996ea98
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/flexvolume/plugin.go
View File

@ -32,7 +32,10 @@ import (
"k8s.io/utils/exec" "k8s.io/utils/exec"
) )
const flexVolumePluginName = "kubernetes.io/flexvolume" const (
flexVolumePluginName = "kubernetes.io/flexvolume"
flexVolumePluginNamePrefix = "flexvolume-"
)
// FlexVolumePlugin object. // FlexVolumePlugin object.
type flexVolumePlugin struct { type flexVolumePlugin struct {
@ -102,7 +105,7 @@ func (plugin *flexVolumePlugin) getExecutable() string {
// Name is part of the volume.VolumePlugin interface. // Name is part of the volume.VolumePlugin interface.
func (plugin *flexVolumePlugin) GetPluginName() string { func (plugin *flexVolumePlugin) GetPluginName() string {
return "flexvolume-" + plugin.driverName return flexVolumePluginNamePrefix + plugin.driverName
} }
// GetVolumeName is part of the volume.VolumePlugin interface. // GetVolumeName is part of the volume.VolumePlugin interface.

8
pkg/volume/plugins_test.go
View File

@ -24,6 +24,8 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
) )
const testPluginName = "kubernetes.io/testPlugin"
func TestSpecSourceConverters(t *testing.T) { func TestSpecSourceConverters(t *testing.T) {
v := &v1.Volume{ v := &v1.Volume{
Name: "foo", Name: "foo",
@ -62,7 +64,7 @@ func (plugin *testPlugins) Init(host VolumeHost) error {
} }
func (plugin *testPlugins) GetPluginName() string { func (plugin *testPlugins) GetPluginName() string {
return "testPlugin" return testPluginName
} }
func (plugin *testPlugins) GetVolumeName(spec *Spec) (string, error) { func (plugin *testPlugins) GetVolumeName(spec *Spec) (string, error) {
@ -106,11 +108,11 @@ func TestVolumePluginMgrFunc(t *testing.T) {
var prober DynamicPluginProber = nil // TODO (#51147) inject mock var prober DynamicPluginProber = nil // TODO (#51147) inject mock
vpm.InitPlugins(newTestPlugin(), prober, nil) vpm.InitPlugins(newTestPlugin(), prober, nil)
plug, err := vpm.FindPluginByName("testPlugin") plug, err := vpm.FindPluginByName(testPluginName)
if err != nil { if err != nil {
t.Errorf("Can't find the plugin by name") t.Errorf("Can't find the plugin by name")
} }
if plug.GetPluginName() != "testPlugin" { if plug.GetPluginName() != testPluginName {
t.Errorf("Wrong name: %s", plug.GetPluginName()) t.Errorf("Wrong name: %s", plug.GetPluginName())
} }