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

Simplify logic of pd.go

Browse Source
This commit is contained in:
Justin Santa Barbara
2015-03-27 08:59:49 -07:00
parent 6a4153fc0a
commit 2812936d34
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/pd.go
View File

@@ -186,16 +186,14 @@ func createPD() (string, error) {
return "", err return "", err
} }
return pdName, nil return pdName, nil
} else if testContext.provider == "aws" { } else {
volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes) volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes)
if !ok { if !ok {
return "", fmt.Errorf("Provider does not implement volumes interface") return "", fmt.Errorf("Provider does not support volumes")
} }
volumeOptions := &aws_cloud.VolumeOptions{} volumeOptions := &aws_cloud.VolumeOptions{}
volumeOptions.CapacityMB = 10 * 1024 volumeOptions.CapacityMB = 10 * 1024
return volumes.CreateVolume(volumeOptions) return volumes.CreateVolume(volumeOptions)
} else {
return "", fmt.Errorf("Unsupported provider type")
} }
} }
@@ -205,14 +203,12 @@ func deletePD(pdName string) error {
// TODO: make this hit the compute API directly. // TODO: make this hit the compute API directly.
return exec.Command("gcloud", "compute", "disks", "delete", "--zone="+zone, pdName).Run() return exec.Command("gcloud", "compute", "disks", "delete", "--zone="+zone, pdName).Run()
} else if testContext.provider == "aws" { } else {
volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes) volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes)
if !ok { if !ok {
return fmt.Errorf("Provider does not implement volumes interface") return "", fmt.Errorf("Provider does not support volumes")
} }
return volumes.DeleteVolume(pdName) return volumes.DeleteVolume(pdName)
} else {
return fmt.Errorf("Unsupported provider type")
} }
} }
@@ -224,14 +220,12 @@ func detachPD(hostName, pdName string) error {
// TODO: make this hit the compute API directly. // TODO: make this hit the compute API directly.
return exec.Command("gcloud", "compute", "instances", "detach-disk", "--zone="+zone, "--disk="+pdName, instanceName).Run() return exec.Command("gcloud", "compute", "instances", "detach-disk", "--zone="+zone, "--disk="+pdName, instanceName).Run()
} else if testContext.provider == "aws" { } else {
volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes) volumes, ok := testContext.cloudConfig.Provider.(aws_cloud.Volumes)
if !ok { if !ok {
return fmt.Errorf("Provider does not implement volumes interface") return "", fmt.Errorf("Provider does not support volumes")
} }
return volumes.DetachDisk(hostName, pdName) return volumes.DetachDisk(hostName, pdName)
} else {
return fmt.Errorf("Unsupported provider type")
} }
} }