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

Revert #7145 now that #7609 is in, and fix the tests that were relying on it.

Browse Source
This commit is contained in:
Alex Robinson
2015-05-01 10:48:28 -07:00
parent cadfde0bd1
commit 890ff7b4aa
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/servicecontroller/servicecontroller.go
View File

@@ -438,7 +438,7 @@ func needsUpdate(oldService *api.Service, newService *api.Service) bool {
}
func (s *ServiceController) loadBalancerName(service *api.Service) string {
return cloudprovider.GetLoadBalancerName(service)
return cloudprovider.GetLoadBalancerName(s.clusterName, service.Namespace, service.Name)
}
func getTCPPorts(service *api.Service) ([]int, error) {
@@ -571,7 +571,7 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *api.Service,
return nil
}
name := cloudprovider.GetLoadBalancerName(service)
name := s.loadBalancerName(service)
err := s.balancer.UpdateTCPLoadBalancer(name, s.zone.Region, hosts)
if err == nil {
return nil

23
pkg/cloudprovider/servicecontroller/servicecontroller_test.go
View File

@@ -27,9 +27,14 @@ import (
)
const region = "us-central"
const clusterName = "test-cluster"
const namespace = "namespace"
func newService(name string, uid types.UID, external bool) *api.Service {
return &api.Service{ObjectMeta: api.ObjectMeta{Name: name, Namespace: "namespace", UID: uid}, Spec: api.ServiceSpec{CreateExternalLoadBalancer: external}}
return &api.Service{ObjectMeta: api.ObjectMeta{Name: name, Namespace: namespace, UID: uid}, Spec: api.ServiceSpec{CreateExternalLoadBalancer: external}}
}
func lbName(serviceName string) string {
return clusterName + "-" + namespace + "-" + serviceName
}
func TestCreateExternalLoadBalancer(t *testing.T) {
@@ -91,7 +96,7 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
cloud := &fake_cloud.FakeCloud{}
cloud.Region = region
client := &testclient.Fake{}
controller := New(cloud, client, "test-cluster")
controller := New(cloud, client, clusterName)
controller.init()
cloud.Calls = nil // ignore any cloud calls made in init()
client.Actions = nil // ignore any client calls made in init()
@@ -155,7 +160,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s0", "333", true),
},
expectedUpdateCalls: []fake_cloud.FakeUpdateBalancerCall{
{Name: "a333", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s0"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
},
},
{
@@ -166,9 +171,9 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s2", "666", true),
},
expectedUpdateCalls: []fake_cloud.FakeUpdateBalancerCall{
{Name: "a444", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: "a555", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: "a666", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s0"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s1"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s2"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
},
},
{
@@ -180,8 +185,8 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s4", "123", false),
},
expectedUpdateCalls: []fake_cloud.FakeUpdateBalancerCall{
{Name: "a888", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: "a999", Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s1"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
{Name: lbName("s3"), Region: region, Hosts: []string{"node0", "node1", "node73"}},
},
},
}
@@ -190,7 +195,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
cloud.Region = region
client := &testclient.Fake{}
controller := New(cloud, client, "test-cluster2")
controller := New(cloud, client, clusterName)
controller.init()
cloud.Calls = nil // ignore any cloud calls made in init()