Add support for Instances

pkg/cloudprovider/providers/cloudstack/cloudstack_test.go

@@ -30,8 +30,8 @@ const testClusterName = "testCluster"
 
 func TestReadConfig(t *testing.T) {
 	_, err := readConfig(nil)
-	if err == nil {
-		t.Errorf("Should fail when no config is provided: %v", err)
+	if err != nil {
+		t.Fatalf("Should not return an error when no config is provided: %v", err)
 	}
 
 	cfg, err := readConfig(strings.NewReader(`
@@ -41,7 +41,6 @@ func TestReadConfig(t *testing.T) {
  secret-key			= a-valid-secret-key
  ssl-no-verify	= true
  project-id			= a-valid-project-id
- zone						= a-valid-zone
  `))
 	if err != nil {
 		t.Fatalf("Should succeed when a valid config is provided: %v", err)
@@ -59,9 +58,6 @@ func TestReadConfig(t *testing.T) {
 	if !cfg.Global.SSLNoVerify {
 		t.Errorf("incorrect ssl-no-verify: %t", cfg.Global.SSLNoVerify)
 	}
-	if cfg.Global.Zone != "a-valid-zone" {
-		t.Errorf("incorrect zone: %s", cfg.Global.Zone)
-	}
 }
 
 // This allows acceptance testing against an existing CloudStack environment.
@@ -72,7 +68,6 @@ func configFromEnv() (*CSConfig, bool) {
 	cfg.Global.APIKey = os.Getenv("CS_API_KEY")
 	cfg.Global.SecretKey = os.Getenv("CS_SECRET_KEY")
 	cfg.Global.ProjectID = os.Getenv("CS_PROJECT_ID")
-	cfg.Global.Zone = os.Getenv("CS_ZONE")
 
 	// It is save to ignore the error here. If the input cannot be parsed SSLNoVerify
 	// will still be a bool with its zero value (false) which is the expected default.
@@ -120,23 +115,3 @@ func TestLoadBalancer(t *testing.T) {
 		t.Fatalf("GetLoadBalancer(\"noexist\") returned exists")
 	}
 }
-
-func TestZones(t *testing.T) {
-	cs := &CSCloud{
-		zone: "myRegion",
-	}
-
-	z, ok := cs.Zones()
-	if !ok {
-		t.Fatalf("Zones() returned false")
-	}
-
-	zone, err := z.GetZone()
-	if err != nil {
-		t.Fatalf("GetZone() returned error: %s", err)
-	}
-
-	if zone.Region != "myRegion" {
-		t.Fatalf("GetZone() returned wrong region (%s)", zone.Region)
-	}
-}