From 5c4290d4f234cbd4958e4ec5daacbbae6ffdefe8 Mon Sep 17 00:00:00 2001
From: Cosmin Cojocar <cosmc@microsoft.com>
Date: Mon, 17 Jul 2017 13:41:06 +0200
Subject: [PATCH] Add tests for other cloud providers

---
 pkg/volume/azure_file/azure_file.go      |  2 +-
 pkg/volume/azure_file/azure_file_test.go | 29 +++++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/pkg/volume/azure_file/azure_file.go b/pkg/volume/azure_file/azure_file.go
index e85d48bdceb..426900a1f28 100644
--- a/pkg/volume/azure_file/azure_file.go
+++ b/pkg/volume/azure_file/azure_file.go
@@ -284,7 +284,7 @@ func getAzureCloud(cloudProvider cloudprovider.Interface) (*azure.Cloud, error)
 func getStorageEndpointSuffix(cloudprovider cloudprovider.Interface) string {
 	const publicCloudStorageEndpointSuffix = "core.windows.net"
 	azure, err := getAzureCloud(cloudprovider)
-	if err == nil {
+	if err != nil {
 		glog.Warningf("No Azure cloud provider found. Using the Azure public cloud endpoint: %s", publicCloudStorageEndpointSuffix)
 		return publicCloudStorageEndpointSuffix
 	}
diff --git a/pkg/volume/azure_file/azure_file_test.go b/pkg/volume/azure_file/azure_file_test.go
index c209c0440b9..4b4e0771a4c 100644
--- a/pkg/volume/azure_file/azure_file_test.go
+++ b/pkg/volume/azure_file/azure_file_test.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
+	fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
@@ -85,7 +86,7 @@ func contains(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAcc
 	return false
 }
 
-func getTestCloud(t *testing.T) *azure.Cloud {
+func getAzureTestCloud(t *testing.T) *azure.Cloud {
 	config := `{
                 "aadClientId": "--aad-client-id--",
                 "aadClientSecret": "--aad-client-secret--"
@@ -102,14 +103,36 @@ func getTestCloud(t *testing.T) *azure.Cloud {
 	return azureCloud
 }
 
-func TestPlugin(t *testing.T) {
+func getTestTempDir(t *testing.T) string {
 	tmpDir, err := ioutil.TempDir(os.TempDir(), "azurefileTest")
 	if err != nil {
 		t.Fatalf("can't make a temp dir: %v", err)
 	}
+	return tmpDir
+}
+
+func TestPluginAzureCloudProvider(t *testing.T) {
+	tmpDir := getTestTempDir(t)
 	defer os.RemoveAll(tmpDir)
+	testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, getAzureTestCloud(t)))
+}
+
+func TestPluginWithoutCloudProvider(t *testing.T) {
+	tmpDir := getTestTempDir(t)
+	defer os.RemoveAll(tmpDir)
+	testPlugin(t, tmpDir, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
+}
+
+func TestPluginWithOtherCloudProvider(t *testing.T) {
+	tmpDir := getTestTempDir(t)
+	defer os.RemoveAll(tmpDir)
+	cloud := &fakecloud.FakeCloud{}
+	testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, cloud))
+}
+
+func testPlugin(t *testing.T, tmpDir string, volumeHost volume.VolumeHost) {
 	plugMgr := volume.VolumePluginMgr{}
-	plugMgr.InitPlugins(ProbeVolumePlugins(), volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, getTestCloud(t)))
+	plugMgr.InitPlugins(ProbeVolumePlugins(), volumeHost)
 
 	plug, err := plugMgr.FindPluginByName("kubernetes.io/azure-file")
 	if err != nil {