Remove gce data race in tests
This commit is contained in:
parent
89313744bc
commit
bb85d6194c
1 changed files with 33 additions and 22 deletions
|
@ -18,30 +18,42 @@ package backends
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
compute "google.golang.org/api/compute/v1"
|
compute "google.golang.org/api/compute/v1"
|
||||||
"k8s.io/ingress/controllers/gce/utils"
|
"k8s.io/ingress/controllers/gce/utils"
|
||||||
|
"k8s.io/kubernetes/pkg/client/cache"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewFakeBackendServices creates a new fake backend services manager.
|
// NewFakeBackendServices creates a new fake backend services manager.
|
||||||
func NewFakeBackendServices() *FakeBackendServices {
|
func NewFakeBackendServices() *FakeBackendServices {
|
||||||
return &FakeBackendServices{
|
return &FakeBackendServices{
|
||||||
backendServices: []*compute.BackendService{},
|
backendServices: cache.NewStore(func(obj interface{}) (string, error) {
|
||||||
|
svc := obj.(*compute.BackendService)
|
||||||
|
return svc.Name, nil
|
||||||
|
}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FakeBackendServices fakes out GCE backend services.
|
// FakeBackendServices fakes out GCE backend services.
|
||||||
type FakeBackendServices struct {
|
type FakeBackendServices struct {
|
||||||
backendServices []*compute.BackendService
|
backendServices cache.Store
|
||||||
calls []int
|
calls []int
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBackendService fakes getting a backend service from the cloud.
|
// GetBackendService fakes getting a backend service from the cloud.
|
||||||
func (f *FakeBackendServices) GetBackendService(name string) (*compute.BackendService, error) {
|
func (f *FakeBackendServices) GetBackendService(name string) (*compute.BackendService, error) {
|
||||||
f.calls = append(f.calls, utils.Get)
|
f.calls = append(f.calls, utils.Get)
|
||||||
for i := range f.backendServices {
|
obj, exists, err := f.backendServices.GetByKey(name)
|
||||||
if name == f.backendServices[i].Name {
|
if !exists {
|
||||||
return f.backendServices[i], nil
|
return nil, fmt.Errorf("Backend service %v not found", name)
|
||||||
}
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
svc := obj.(*compute.BackendService)
|
||||||
|
if name == svc.Name {
|
||||||
|
return svc, nil
|
||||||
}
|
}
|
||||||
return nil, fmt.Errorf("Backend service %v not found", name)
|
return nil, fmt.Errorf("Backend service %v not found", name)
|
||||||
}
|
}
|
||||||
|
@ -50,37 +62,36 @@ func (f *FakeBackendServices) GetBackendService(name string) (*compute.BackendSe
|
||||||
func (f *FakeBackendServices) CreateBackendService(be *compute.BackendService) error {
|
func (f *FakeBackendServices) CreateBackendService(be *compute.BackendService) error {
|
||||||
f.calls = append(f.calls, utils.Create)
|
f.calls = append(f.calls, utils.Create)
|
||||||
be.SelfLink = be.Name
|
be.SelfLink = be.Name
|
||||||
f.backendServices = append(f.backendServices, be)
|
return f.backendServices.Update(be)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteBackendService fakes backend service deletion.
|
// DeleteBackendService fakes backend service deletion.
|
||||||
func (f *FakeBackendServices) DeleteBackendService(name string) error {
|
func (f *FakeBackendServices) DeleteBackendService(name string) error {
|
||||||
f.calls = append(f.calls, utils.Delete)
|
f.calls = append(f.calls, utils.Delete)
|
||||||
newBackends := []*compute.BackendService{}
|
svc, exists, err := f.backendServices.GetByKey(name)
|
||||||
for i := range f.backendServices {
|
if !exists {
|
||||||
if name != f.backendServices[i].Name {
|
return fmt.Errorf("Backend service %v not found", name)
|
||||||
newBackends = append(newBackends, f.backendServices[i])
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
f.backendServices = newBackends
|
if err != nil {
|
||||||
return nil
|
return err
|
||||||
|
}
|
||||||
|
return f.backendServices.Delete(svc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListBackendServices fakes backend service listing.
|
// ListBackendServices fakes backend service listing.
|
||||||
func (f *FakeBackendServices) ListBackendServices() (*compute.BackendServiceList, error) {
|
func (f *FakeBackendServices) ListBackendServices() (*compute.BackendServiceList, error) {
|
||||||
return &compute.BackendServiceList{Items: f.backendServices}, nil
|
var svcs []*compute.BackendService
|
||||||
|
for _, s := range f.backendServices.List() {
|
||||||
|
svc := s.(*compute.BackendService)
|
||||||
|
svcs = append(svcs, svc)
|
||||||
|
}
|
||||||
|
return &compute.BackendServiceList{Items: svcs}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateBackendService fakes updating a backend service.
|
// UpdateBackendService fakes updating a backend service.
|
||||||
func (f *FakeBackendServices) UpdateBackendService(be *compute.BackendService) error {
|
func (f *FakeBackendServices) UpdateBackendService(be *compute.BackendService) error {
|
||||||
f.calls = append(f.calls, utils.Update)
|
f.calls = append(f.calls, utils.Update)
|
||||||
for i := range f.backendServices {
|
return f.backendServices.Update(be)
|
||||||
if f.backendServices[i].Name == be.Name {
|
|
||||||
f.backendServices[i] = be
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetHealth fakes getting backend service health.
|
// GetHealth fakes getting backend service health.
|
||||||
|
|
Loading…
Reference in a new issue