github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

Service REST test: Fix some names

Browse Source
This commit is contained in:
Tim Hockin 2021-07-01 23:05:57 -07:00
parent 54b6a416fb
commit ca708fa9ac
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/registry/core/service/storage/rest_test.go
View File

@ -752,7 +752,7 @@ func TestServiceStorageValidatesUpdate(t *testing.T) {
} }
} }
func TestServiceRegistryExternalService(t *testing.T) { func TestServiceRegistryLoadBalancerService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext() ctx := genericapirequest.NewDefaultContext()
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
@ -949,7 +949,7 @@ func TestDualStackServiceRegistryDeleteDryRun(t *testing.T) {
} }
} }
func TestServiceRegistryDeleteExternal(t *testing.T) { func TestServiceRegistryDeleteExternalName(t *testing.T) {
ctx := genericapirequest.NewDefaultContext() ctx := genericapirequest.NewDefaultContext()
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
@ -964,19 +964,19 @@ func TestServiceRegistryDeleteExternal(t *testing.T) {
} }
} }
func TestServiceRegistryUpdateExternalService(t *testing.T) { func TestServiceRegistryUpdateLoadBalancerService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext() ctx := genericapirequest.NewDefaultContext()
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
// Create non-external load balancer. // Create non-loadbalancer.
svc1 := svctest.MakeService("foo") svc1 := svctest.MakeService("foo")
obj, err := storage.Create(ctx, svc1, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) obj, err := storage.Create(ctx, svc1, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
// Modify load balancer to be external. // Modify to be loadbalancer.
svc2 := obj.(*api.Service).DeepCopy() svc2 := obj.(*api.Service).DeepCopy()
svc2.Spec.Type = api.ServiceTypeLoadBalancer svc2.Spec.Type = api.ServiceTypeLoadBalancer
if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2), rest.ValidateAllObjectFunc, rest.ValidateAllObjectUpdateFunc, false, &metav1.UpdateOptions{}); err != nil { if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2), rest.ValidateAllObjectFunc, rest.ValidateAllObjectUpdateFunc, false, &metav1.UpdateOptions{}); err != nil {
@ -992,12 +992,12 @@ func TestServiceRegistryUpdateExternalService(t *testing.T) {
} }
} }
func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) { func TestServiceRegistryUpdateMultiPortLoadBalancerService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext() ctx := genericapirequest.NewDefaultContext()
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
// Create external load balancer. // Create load balancer.
svc1 := svctest.MakeService("foo", svc1 := svctest.MakeService("foo",
svctest.SetTypeLoadBalancer, svctest.SetTypeLoadBalancer,
svctest.SetPorts( svctest.SetPorts(