From cdd963f4de73399ecfdd382af245d2f5a77ad98f Mon Sep 17 00:00:00 2001 From: Ayush Rangwala Date: Tue, 30 Jan 2024 22:38:30 +0530 Subject: [PATCH] add cleanup gateway --- .../bgp-dynamic-neighbour/delete_test.go | 2 +- .../bgp-dynamic-neighbour/get_test.go | 2 +- .../bgp-dynamic-neighbour/list_test.go | 2 +- test/helper/helper.go | 20 +++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/e2e/gateways/bgp-dynamic-neighbour/delete_test.go b/test/e2e/gateways/bgp-dynamic-neighbour/delete_test.go index b5dc8e80..d85c054a 100644 --- a/test/e2e/gateways/bgp-dynamic-neighbour/delete_test.go +++ b/test/e2e/gateways/bgp-dynamic-neighbour/delete_test.go @@ -24,7 +24,7 @@ func TestBgpDynamicNeighbors_Delete(t *testing.T) { vrf := helper.CreateTestVrfs(t, project.GetId(), "test-vrf-"+randomStr, vlan.GetVxlan()) vrfIpRes := helper.CreateTestVrfIpRequest(t, project.GetId(), vrf.GetId()) gway := helper.CreateTestVrfGateway(t, project.GetId(), vrfIpRes.VrfIpReservation.GetId(), vlan.GetId()) - bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbour(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) + bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbor(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) tests := []struct { name string diff --git a/test/e2e/gateways/bgp-dynamic-neighbour/get_test.go b/test/e2e/gateways/bgp-dynamic-neighbour/get_test.go index 55bf3c61..bb9aac68 100644 --- a/test/e2e/gateways/bgp-dynamic-neighbour/get_test.go +++ b/test/e2e/gateways/bgp-dynamic-neighbour/get_test.go @@ -22,7 +22,7 @@ func TestBgpDynamicNeighbors_Get(t *testing.T) { vrf := helper.CreateTestVrfs(t, project.GetId(), "test-vrf-"+randomStr, vlan.GetVxlan()) vrfIpRes := helper.CreateTestVrfIpRequest(t, project.GetId(), vrf.GetId()) gway := helper.CreateTestVrfGateway(t, project.GetId(), vrfIpRes.VrfIpReservation.GetId(), vlan.GetId()) - bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbour(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) + bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbor(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) tests := []struct { name string diff --git a/test/e2e/gateways/bgp-dynamic-neighbour/list_test.go b/test/e2e/gateways/bgp-dynamic-neighbour/list_test.go index 25bdd9dc..9def2c90 100644 --- a/test/e2e/gateways/bgp-dynamic-neighbour/list_test.go +++ b/test/e2e/gateways/bgp-dynamic-neighbour/list_test.go @@ -22,7 +22,7 @@ func TestBgpDynamicNeighbors_List(t *testing.T) { vrf := helper.CreateTestVrfs(t, project.GetId(), "test-vrf-"+randomStr, vlan.GetVxlan()) vrfIpRes := helper.CreateTestVrfIpRequest(t, project.GetId(), vrf.GetId()) gway := helper.CreateTestVrfGateway(t, project.GetId(), vrfIpRes.VrfIpReservation.GetId(), vlan.GetId()) - bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbour(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) + bgpDynamicNeighbor := helper.CreateTestBgpDynamicNeighbor(t, gway.GetId(), gway.IpReservation.GetAddress(), 65000) tests := []struct { name string diff --git a/test/helper/helper.go b/test/helper/helper.go index f2cd6b5d..2ff1293a 100644 --- a/test/helper/helper.go +++ b/test/helper/helper.go @@ -127,6 +127,10 @@ func CreateTestGateway(t *testing.T, projectId, vlanId string, privateIPv4Subnet t.Fatal("Nil gateway returned. Error when calling `MetalGatewaysApi.CreateMetalGateway`") } + t.Cleanup(func() { + CleanTestGateway(t, gateway.MetalGateway.GetId()) + }) + return gateway.MetalGateway } @@ -401,18 +405,17 @@ func AssertPortCmdOutput(t *testing.T, port *metalv1.Port, out, networkType stri } } -func CleanTestGateway(t *testing.T, gatewayId string) error { +func CleanTestGateway(t *testing.T, gatewayId string) { t.Helper() TestApiClient := TestClient() - _, _, err := TestApiClient.MetalGatewaysApi. + _, resp, err := TestApiClient.MetalGatewaysApi. DeleteMetalGateway(context.Background(), gatewayId). Include([]string{"ip_reservation"}). Execute() - if err != nil { - return fmt.Errorf("Error when calling `MetalGatewaysApi.DeleteMetalGateway`` for %v: %v\n", gatewayId, err) + if err != nil && resp.StatusCode != http.StatusNotFound { + t.Fatalf("Error when calling `MetalGatewaysApi.DeleteMetalGateway`` for %v: %v\n", gatewayId, err) } - return nil } func CreateTestInterConnection(t *testing.T, projectId, name string) *metalv1.Interconnection { @@ -675,7 +678,7 @@ func CleanTestVrfs(t *testing.T, vrfId string) { resp, err := TestApiClient.VRFsApi.DeleteVrf(context.Background(), vrfId).Execute() if err != nil && resp.StatusCode != http.StatusNotFound { - t.Fatalf("Error when calling `VRFsApi.DeleteVrf`` for %v: %v\n", vrfId, err) + t.Fatalf("Error when calling `VRFsApi.DeleteVrf`` for ID: %v: with error: %v\n", vrfId, err) } } @@ -713,7 +716,6 @@ func CleanTestVrfIpRequest(t *testing.T, IPReservationId string) { } } -<<<<<<< HEAD func CreateTestVrfRoute(t *testing.T, vrfId string) *metalv1.VrfRoute { t.Helper() TestApiClient := TestClient() @@ -782,10 +784,8 @@ func CleanTestVrfGateway(t *testing.T, gatewayId string) { t.Fatalf("Error when calling `MetalGatewaysApi.DeleteMetalGateway`` for %v: %v\n", gatewayId, err) } } -func CreateTestBgpDynamicNeighbour(t *testing.T, gatewayId, iprange string, asn int32) *metalv1.BgpDynamicNeighbor { -======= + func CreateTestBgpDynamicNeighbor(t *testing.T, gatewayId, iprange string, asn int32) *metalv1.BgpDynamicNeighbor { ->>>>>>> e44373e (Fix review comments) TestApiClient := TestClient() t.Helper()