add unit test for cloud-provider-adapter

pkg/neg/types/cloudprovideradapter_test.go

@@ -0,0 +1,114 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package types
+
+import (
+	"k8s.io/legacy-cloud-providers/gce"
+	"testing"
+
+	"google.golang.org/api/compute/v1"
+
+	"k8s.io/apimachinery/pkg/util/sets"
+)
+
+func TestAggregatedListNetworkEndpointGroup(t *testing.T) {
+	t.Parallel()
+
+	const (
+		neg1  = "neg1"
+		zone1 = "zone1"
+		neg2  = "neg2"
+		zone2 = "zone2"
+	)
+
+	fakeGCE := gce.NewFakeGCECloud(gce.DefaultTestClusterValues())
+	MockNetworkEndpointAPIs(fakeGCE)
+	fakeCloud := NewAdapter(fakeGCE)
+
+	validateAggregatedList(t, fakeCloud, 0, map[string][]string{})
+
+	neg := &compute.NetworkEndpointGroup{Name: neg1}
+	zone := zone1
+	if err := fakeCloud.CreateNetworkEndpointGroup(neg, zone); err != nil {
+		t.Fatalf("Got CreateNetworkEndpointGroup(%v, %v) = %v, want nil", neg, zone, err)
+	}
+
+	validateAggregatedList(t, fakeCloud, 1, map[string][]string{zone1: {neg1}})
+
+	neg = &compute.NetworkEndpointGroup{Name: neg2}
+	zone = zone2
+	if err := fakeCloud.CreateNetworkEndpointGroup(neg, zone); err != nil {
+		t.Fatalf("Got CreateNetworkEndpointGroup(%v, %v) = %v, want nil", neg, zone, err)
+	}
+
+	validateAggregatedList(t, fakeCloud, 2, map[string][]string{zone1: {neg1}, zone2: {neg2}})
+
+	neg = &compute.NetworkEndpointGroup{Name: neg1}
+	zone = zone2
+	if err := fakeCloud.CreateNetworkEndpointGroup(neg, zone); err != nil {
+		t.Fatalf("Got CreateNetworkEndpointGroup(%v, %v) = %v, want nil", neg, zone, err)
+	}
+
+	validateAggregatedList(t, fakeCloud, 2, map[string][]string{zone1: {neg1}, zone2: {neg1, neg2}})
+
+	if err := fakeCloud.DeleteNetworkEndpointGroup(neg1, zone1); err != nil {
+		t.Fatalf("Got DeleteNetworkEndpointGroup(%v, %v) = %v, want nil", neg1, zone1, err)
+	}
+
+	validateAggregatedList(t, fakeCloud, 1, map[string][]string{zone2: {neg1, neg2}})
+}
+
+func validateAggregatedList(t *testing.T, adapter NetworkEndpointGroupCloud, expectZoneNum int, expectZoneNegs map[string][]string) {
+	ret, err := adapter.AggregatedListNetworkEndpointGroup()
+	if err != nil {
+		t.Errorf("Expect AggregatedListNetworkEndpointGroup to return nil error, but got %v", err)
+	}
+	if len(ret) != expectZoneNum {
+		t.Errorf("Expect len(ret) == %v, got %v", expectZoneNum, len(ret))
+	}
+
+	zoneNames := sets.NewString()
+	expectZoneNames := sets.NewString()
+	for key := range expectZoneNegs {
+		expectZoneNames.Insert(key)
+	}
+	for zone, negs := range ret {
+		zoneNames.Insert(zone)
+		negNames := sets.NewString()
+		expectNegNames := sets.NewString()
+
+		for _, neg := range negs {
+			negNames.Insert(neg.Name)
+		}
+
+		expectNegs, ok := expectZoneNegs[zone]
+		if !ok {
+			t.Errorf("Zone %v from return is not expected", zone)
+			continue
+		}
+
+		for _, neg := range expectNegs {
+			expectNegNames.Insert(neg)
+		}
+		if !negNames.Equal(expectNegNames) {
+			t.Errorf("Expect NEG names %v, but got %v", expectNegNames.List(), negNames.List())
+		}
+	}
+
+	if !zoneNames.Equal(expectZoneNames) {
+		t.Errorf("Expect zones %v, but got %v", expectZoneNames.List(), zoneNames.List())
+	}
+}

pkg/neg/types/mock.go

@@ -59,6 +59,39 @@ func MockNetworkEndpointAPIs(fakeGCE *gce.Cloud) {
 	m.MockNetworkEndpointGroups.AttachNetworkEndpointsHook = MockAttachNetworkEndpointsHook
 	m.MockNetworkEndpointGroups.DetachNetworkEndpointsHook = MockDetachNetworkEndpointsHook
 	m.MockNetworkEndpointGroups.ListNetworkEndpointsHook = MockListNetworkEndpointsHook
+	m.MockNetworkEndpointGroups.AggregatedListHook = MockAggregatedListNetworkEndpointGroupHook
+}
+
+// TODO: move this logic into code gen
+// TODO: make AggregateList return map[meta.Key]Object
+func MockAggregatedListNetworkEndpointGroupHook(ctx context.Context, fl *filter.F, m *cloud.MockNetworkEndpointGroups) (bool, map[string][]*compute.NetworkEndpointGroup, error) {
+	objs := map[string][]*compute.NetworkEndpointGroup{}
+	for _, obj := range m.Objects {
+		res, err := cloud.ParseResourceURL(obj.ToGA().SelfLink)
+		if err != nil {
+			return false, nil, err
+		}
+		if !fl.Match(obj.ToGA()) {
+			continue
+		}
+		var location string
+		switch res.Key.Type() {
+		case meta.Regional:
+			location = fmt.Sprintf("regions/%s", res.Key.Region)
+			break
+		case meta.Zonal:
+			location = fmt.Sprintf("zones/%s", res.Key.Zone)
+			break
+		case meta.Global:
+			location = string(meta.Global)
+		}
+		objs[location] = append(objs[location], obj.ToGA())
+	}
+	// Always return global
+	if _, ok := objs[meta.Global]; !ok {
+		objs[meta.Global] = []*compute.NetworkEndpointGroup{}
+	}
+	return true, objs, nil
 }
 
 func MockListNetworkEndpointsHook(ctx context.Context, key *meta.Key, obj *compute.NetworkEndpointGroupsListEndpointsRequest, filter *filter.F, m *cloud.MockNetworkEndpointGroups) ([]*compute.NetworkEndpointWithHealthStatus, error) {