Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add staticroute e2e test #685

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/nsx/services/common/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ var (
ResourceTypeVirtualMachine = "VirtualMachine"
ResourceTypeLBService = "LBService"
ResourceTypeVpcAttachment = "VpcAttachment"
ResourceTypeStaticRoute = "StaticRoute"
ResourceTypeShare = "Share"
ResourceTypeSharedResource = "SharedResource"
ResourceTypeChildSharedResource = "ChildSharedResource"
Expand Down
8 changes: 4 additions & 4 deletions pkg/nsx/services/staticroute/staticroute.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (service *StaticRouteService) DeleteStaticRouteByPath(orgId string, project
return err
}

log.Info("successfully deleted NSX StaticRoute", "nsxStaticRoute", *staticroute.Id)
log.Info("Successfully deleted NSX StaticRoute", "nsxStaticRoute", *staticroute.Id)
return nil
}
func (service *StaticRouteService) GetUID(staticroute *model.StaticRoutes) *string {
Expand Down Expand Up @@ -173,17 +173,17 @@ func (service *StaticRouteService) ListStaticRoute() []*model.StaticRoutes {

func (service *StaticRouteService) Cleanup(ctx context.Context) error {
staticRouteSet := service.ListStaticRoute()
log.Info("cleanup staticroute", "count", len(staticRouteSet))
log.Info("Cleanup staticroute", "count", len(staticRouteSet))
for _, staticRoute := range staticRouteSet {
path := strings.Split(*staticRoute.Path, "/")
log.Info("removing staticroute", "staticroute path", *staticRoute.Path)
log.Info("Deleting staticroute", "staticroute path", *staticRoute.Path)
select {
case <-ctx.Done():
return errors.Join(nsxutil.TimeoutFailed, ctx.Err())
default:
err := service.DeleteStaticRouteByPath(path[2], path[4], path[6], *staticRoute.Id)
if err != nil {
log.Error(err, "remove staticroute failed", "staticroute id", *staticRoute.Id)
log.Error(err, "Delete staticroute failed", "staticroute id", *staticRoute.Id)
return err
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/e2e/manifest/testStaticRoute/staticroute.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: nsx.vmware.com/v1alpha1
kind: StaticRoute
metadata:
name: guestcluster-staticroute-2
spec:
network: 45.1.2.0/24
nextHops:
- ipAddress: 172.10.0.2
45 changes: 45 additions & 0 deletions test/e2e/nsx_staticroute_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// This file is for e2e StaticRoute tests.

package e2e

import (
"path/filepath"
"testing"

"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"
)

const (
StaticRoute = "StaticRoute"
)

// TestStaticRouteBasic verifies that it could successfully realize StaticRoute.
func TestStaticRouteBasic(t *testing.T) {
ns := "sc-a"
name := "guestcluster-staticroute-2"
setupTest(t, ns)
defer teardownTest(t, ns, defaultTimeout)

// Create StaticRoute
StaticRoutePath, _ := filepath.Abs("./manifest/testStaticRoute/staticroute.yaml")
err := applyYAML(StaticRoutePath, ns)
if err != nil {
t.Fatalf("Failed to apply StaticRoute YAML file: %v", err)
}
assertNil(t, err)

// Check StaticRoute status
err = testData.waitForCRReadyOrDeleted(defaultTimeout, StaticRoute, ns, name, Ready)
assertNil(t, err, "Error when waiting for Static Route %s", name)

// Check nsx-t resource existing
err = testData.waitForResourceExistOrNot(ns, common.ResourceTypeStaticRoute, name, true)
assertNil(t, err)

// Delete StaticRoute
_ = deleteYAML(StaticRoutePath, ns)

// Check nsx-t resource not existing
err = testData.waitForResourceExistOrNot(ns, common.ResourceTypeStaticRoute, name, false)
assertNil(t, err)
}
Loading