chore: more tests, get rid of dead code, rationalize GetPrimaryAvaila…

…bilitySetName
Azure · Apr 11, 2019 · 8f991cb · 8f991cb
1 parent 63f70b8
commit 8f991cb
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 10 deletions.
diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -889,7 +889,9 @@ func (p *Properties) GetNSGName() string {
 // GetPrimaryAvailabilitySetName returns the name of the primary availability set of the cluster
 func (p *Properties) GetPrimaryAvailabilitySetName() string {
 	if p.AgentPoolProfiles != nil {
-		return p.AgentPoolProfiles[0].Name + "-availabilitySet-" + p.GetClusterID()
+		if p.AgentPoolProfiles[0].AvailabilityProfile == AvailabilitySet {
+			return p.AgentPoolProfiles[0].Name + "-availabilitySet-" + p.GetClusterID()
+		}
 	}
 	return ""
 }

diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go
@@ -2207,6 +2207,27 @@ func TestGetPrimaryAvailabilitySetName(t *testing.T) {
 	if got != expected {
 		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
 	}
+
+	p.AgentPoolProfiles = []*AgentPoolProfile{
+		{
+			Name:                "agentpool",
+			VMSize:              "Standard_D2_v2",
+			Count:               1,
+			AvailabilityProfile: VirtualMachineScaleSets,
+		},
+	}
+	expected = ""
+	got = p.GetPrimaryAvailabilitySetName()
+	if got != expected {
+		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
+	}
+
+	p.AgentPoolProfiles = nil
+	expected = ""
+	got = p.GetPrimaryAvailabilitySetName()
+	if got != expected {
+		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
+	}
 }
 
 func TestGetPrimaryScaleSetName(t *testing.T) {
@@ -2232,14 +2253,35 @@ func TestGetPrimaryScaleSetName(t *testing.T) {
 	expected := "k8s-agentpool-28513887-vmss"
 	got := p.GetPrimaryScaleSetName()
 	if got != expected {
-		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
+		t.Errorf("expected primary scaleset name %s, but got %s", expected, got)
 	}
 
 	// Test with Windows agentpool
 	p.AgentPoolProfiles[0].OSType = "Windows"
 
 	expected = "2851k8s00"
 	got = p.GetPrimaryScaleSetName()
+	if got != expected {
+		t.Errorf("expected primary scaleset name %s, but got %s", expected, got)
+	}
+
+	p.AgentPoolProfiles = []*AgentPoolProfile{
+		{
+			Name:                "agentpool",
+			VMSize:              "Standard_D2_v2",
+			Count:               1,
+			AvailabilityProfile: AvailabilitySet,
+		},
+	}
+	expected = ""
+	got = p.GetPrimaryScaleSetName()
+	if got != expected {
+		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
+	}
+
+	p.AgentPoolProfiles = nil
+	expected = ""
+	got = p.GetPrimaryScaleSetName()
 	if got != expected {
 		t.Errorf("expected primary availability set name %s, but got %s", expected, got)
 	}

diff --git a/pkg/engine/armvariables.go b/pkg/engine/armvariables.go
@@ -326,7 +326,6 @@ func getK8sMasterVars(cs *api.ContainerService) (map[string]interface{}, error)
 	}
 
 	if cs.Properties.AnyAgentUsesVirtualMachineScaleSets() {
-		masterVars["primaryScaleSetName"] = cs.Properties.GetPrimaryScaleSetName()
 		masterVars["primaryAvailabilitySetName"] = ""
 		masterVars["vmType"] = "vmss"
 	} else {
@@ -335,9 +334,9 @@ func getK8sMasterVars(cs *api.ContainerService) (map[string]interface{}, error)
 		} else {
 			masterVars["primaryAvailabilitySetName"] = ""
 		}
-		masterVars["primaryScaleSetName"] = ""
 		masterVars["vmType"] = "standard"
 	}
+	masterVars["primaryScaleSetName"] = cs.Properties.GetPrimaryScaleSetName()
 
 	if isHostedMaster {
 		masterVars["kubernetesAPIServerIP"] = "[parameters('kubernetesEndpoint')]"

diff --git a/pkg/engine/template_generator.go b/pkg/engine/template_generator.go
@@ -968,12 +968,6 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 		"GetMasterEtcdClientPort": func() int {
 			return DefaultMasterEtcdClientPort
 		},
-		"GetPrimaryAvailabilitySetName": func() string {
-			return cs.Properties.GetPrimaryAvailabilitySetName()
-		},
-		"GetPrimaryScaleSetName": func() string {
-			return cs.Properties.GetPrimaryScaleSetName()
-		},
 		"UseCloudControllerManager": func() bool {
 			return cs.Properties.OrchestratorProfile.KubernetesConfig.UseCloudControllerManager != nil && *cs.Properties.OrchestratorProfile.KubernetesConfig.UseCloudControllerManager
 		},