github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename AccessMode to PersistentVolumeAccessMode

Browse Source
This commit is contained in:
Tim Hockin
2015-05-18 13:22:30 -07:00
parent a548d542db
commit f66ca25d9f
33 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/aws_ebs/aws_ebs.go
View File

@@ -62,8 +62,8 @@ func (plugin *awsElasticBlockStorePlugin) CanSupport(spec *volume.Spec) bool {
return spec.PersistentVolumeSource.AWSElasticBlockStore != nil || spec.VolumeSource.AWSElasticBlockStore != nil
}
func (plugin *awsElasticBlockStorePlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *awsElasticBlockStorePlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
}
}

2
pkg/volume/aws_ebs/aws_ebs_test.go
View File

@@ -58,7 +58,7 @@ func TestGetAccessModes(t *testing.T) {
}
}
func contains(modes []api.AccessModeType, mode api.AccessModeType) bool {
func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
for _, m := range modes {
if m == mode {
return true

4
pkg/volume/gce_pd/gce_pd.go
View File

@@ -68,8 +68,8 @@ func (plugin *gcePersistentDiskPlugin) CanSupport(spec *volume.Spec) bool {
return spec.VolumeSource.GCEPersistentDisk != nil || spec.PersistentVolumeSource.GCEPersistentDisk != nil
}
func (plugin *gcePersistentDiskPlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *gcePersistentDiskPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
api.ReadOnlyMany,
}

2
pkg/volume/gce_pd/gce_pd_test.go
View File

@@ -55,7 +55,7 @@ func TestGetAccessModes(t *testing.T) {
}
}
func contains(modes []api.AccessModeType, mode api.AccessModeType) bool {
func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
for _, m := range modes {
if m == mode {
return true

4
pkg/volume/glusterfs/glusterfs.go
View File

@@ -56,8 +56,8 @@ func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool {
return spec.VolumeSource.Glusterfs != nil || spec.PersistentVolumeSource.Glusterfs != nil
}
func (plugin *glusterfsPlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *glusterfsPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
api.ReadOnlyMany,
api.ReadWriteMany,

2
pkg/volume/glusterfs/glusterfs_test.go
View File

@@ -58,7 +58,7 @@ func TestGetAccessModes(t *testing.T) {
}
}
func contains(modes []api.AccessModeType, mode api.AccessModeType) bool {
func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
for _, m := range modes {
if m == mode {
return true

4
pkg/volume/host_path/host_path.go
View File

@@ -52,8 +52,8 @@ func (plugin *hostPathPlugin) CanSupport(spec *volume.Spec) bool {
return spec.VolumeSource.HostPath != nil || spec.PersistentVolumeSource.HostPath != nil
}
func (plugin *hostPathPlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *hostPathPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
}
}

2
pkg/volume/host_path/host_path_test.go
View File

@@ -52,7 +52,7 @@ func TestGetAccessModes(t *testing.T) {
t.Errorf("Can't find the plugin by name")
}
if len(plug.GetAccessModes()) != 1 || plug.GetAccessModes()[0] != api.ReadWriteOnce {
t.Errorf("Expected %s AccessModeType", api.ReadWriteOnce)
t.Errorf("Expected %s PersistentVolumeAccessMode", api.ReadWriteOnce)
}
}

4
pkg/volume/iscsi/iscsi.go
View File

@@ -65,8 +65,8 @@ func (plugin *ISCSIPlugin) CanSupport(spec *volume.Spec) bool {
return false
}
func (plugin *ISCSIPlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *ISCSIPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
api.ReadOnlyMany,
}

4
pkg/volume/nfs/nfs.go
View File

@@ -55,8 +55,8 @@ func (plugin *nfsPlugin) CanSupport(spec *volume.Spec) bool {
return spec.VolumeSource.NFS != nil
}
func (plugin *nfsPlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{
func (plugin *nfsPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
api.ReadOnlyMany,
api.ReadWriteMany,

2
pkg/volume/nfs/nfs_test.go
View File

@@ -57,7 +57,7 @@ func TestGetAccessModes(t *testing.T) {
}
}
func contains(modes []api.AccessModeType, mode api.AccessModeType) bool {
func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
for _, m := range modes {
if m == mode {
return true

2
pkg/volume/plugins.go
View File

@@ -76,7 +76,7 @@ type VolumePlugin interface {
type PersistentVolumePlugin interface {
VolumePlugin
// GetAccessModes describes the ways a given volume can be accessed/mounted.
GetAccessModes() []api.AccessModeType
GetAccessModes() []api.PersistentVolumeAccessMode
}
// VolumeHost is an interface that plugins can use to access the kubelet.

4
pkg/volume/testing.go
View File

@@ -104,8 +104,8 @@ func (plugin *FakeVolumePlugin) NewCleaner(volName string, podUID types.UID, mou
return &FakeVolume{podUID, volName, plugin}, nil
}
func (plugin *FakeVolumePlugin) GetAccessModes() []api.AccessModeType {
return []api.AccessModeType{}
func (plugin *FakeVolumePlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{}
}
type FakeVolume struct {

4
pkg/volume/util.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
)
func GetAccessModesAsString(modes []api.AccessModeType) string {
func GetAccessModesAsString(modes []api.PersistentVolumeAccessMode) string {
modesAsString := ""
if contains(modes, api.ReadWriteOnce) {
@@ -43,7 +43,7 @@ func appendAccessMode(modes *string, mode string) {
*modes += mode
}
func contains(modes []api.AccessModeType, mode api.AccessModeType) bool {
func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
for _, m := range modes {
if m == mode {
return true