diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go index 8d034f4b05e..16c1acf917e 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go @@ -34,6 +34,65 @@ import ( kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" ) +const ( + projectID = "test-project" + region = "us-central1" + zoneName = "us-central1-b" + nodeName = "test-node-1" + clusterName = "Test Cluster Name" + clusterID = "test-cluster-id" + serviceName = "" +) + +var apiService = &v1.Service{ + Spec: v1.ServiceSpec{ + SessionAffinity: v1.ServiceAffinityClientIP, + Type: v1.ServiceTypeClusterIP, + Ports: []v1.ServicePort{{Protocol: v1.ProtocolTCP, Port: int32(123)}}, + }, +} + +func fakeGCECloud() (*GCECloud, error) { + client, err := newOauthClient(nil) + if err != nil { + return nil, err + } + + service, err := compute.New(client) + if err != nil { + return nil, err + } + + // Used in disk unit tests + fakeManager := newFakeManager(projectID, region) + zonesWithNodes := createNodeZones([]string{zoneName}) + + alphaFeatureGate, err := NewAlphaFeatureGate([]string{}) + if err != nil { + return nil, err + } + + gce := &GCECloud{ + region: region, + service: service, + manager: fakeManager, + managedZones: []string{zoneName}, + projectID: projectID, + networkProjectID: projectID, + AlphaFeatureGate: alphaFeatureGate, + nodeZones: zonesWithNodes, + nodeInformerSynced: func() bool { return true }, + } + + cloud := cloud.NewMockGCE(&gceProjectRouter{gce}) + cloud.MockTargetPools.AddInstanceHook = mock.AddInstanceHook + cloud.MockTargetPools.RemoveInstanceHook = mock.RemoveInstanceHook + + gce.c = cloud + + return gce, nil +} + func TestEnsureStaticIP(t *testing.T) { fcas := NewFakeCloudAddressService() ipName := "some-static-ip" @@ -245,65 +304,6 @@ func TestDeleteAddressWithWrongTier(t *testing.T) { } } -const ( - gceProjectId = "test-project" - gceRegion = "us-central1" - zoneName = "us-central1-b" - nodeName = "test-node-1" - clusterName = "Test Cluster Name" - clusterID = "test-cluster-id" -) - -var apiService = &v1.Service{ - Spec: v1.ServiceSpec{ - SessionAffinity: v1.ServiceAffinityClientIP, - Type: v1.ServiceTypeClusterIP, - Ports: []v1.ServicePort{{Protocol: v1.ProtocolTCP, Port: int32(123)}}, - }, -} - -func fakeGCECloud() (*GCECloud, error) { - client, err := newOauthClient(nil) - if err != nil { - return nil, err - } - - service, err := compute.New(client) - if err != nil { - return nil, err - } - - // Used in disk unit tests - fakeManager := newFakeManager(gceProjectId, gceRegion) - zonesWithNodes := createNodeZones([]string{zoneName}) - - alphaFeatureGate, err := NewAlphaFeatureGate([]string{}) - if err != nil { - return nil, err - } - - gce := &GCECloud{ - region: gceRegion, - service: service, - manager: fakeManager, - managedZones: []string{zoneName}, - projectID: gceProjectId, - networkProjectID: gceProjectId, - AlphaFeatureGate: alphaFeatureGate, - nodeZones: zonesWithNodes, - nodeInformerSynced: func() bool { return true }, - } - - cloud := cloud.NewMockGCE(&gceProjectRouter{gce}) - cloud.MockTargetPools.AddInstanceHook = mock.AddInstanceHook - cloud.MockTargetPools.RemoveInstanceHook = mock.RemoveInstanceHook - cloud.MockAlphaForwardingRules.GetHook = mock.GetAlphaFwdRuleHook - - gce.c = cloud - - return gce, nil -} - func createAndInsertNodes(gce *GCECloud, nodeNames []string) ([]*v1.Node, error) { nodes := []*v1.Node{}