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.

Sign up for GitHub

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

Feature/wip fv tests #539

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Feature/wip fv tests #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e882e15
agent: refactor integration tests to include fv tests
hedibouattour Feb 10, 2023
3b1ff01
agent: add first fv tests version
hedibouattour Feb 10, 2023
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
11 changes: 8 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,14 @@ release: check-TAG check-CALICO_TAG
@echo "***IMPORTANT***IMPORTANT***IMPORTANT***IMPORTANT***"
@echo "Please update \"vppbranch\" in https://github.com/projectcalico/calico/blob/${CALICO_TAG}/calico/_config.yml to ${TAG} otherwise the install docs get broken."

.PHONY: run-integration-tests
run-integration-tests:
cd test/integration-tests;./run-tests.sh
.PHONY: run-integration-tests-cni
run-integration-tests-cni:
cd test/integration-tests;./run-tests.sh cni

.PHONY: run-integration-tests-policy
run-integration-tests-policy:
$(MAKE) -C felix fv-prereqs
cd test/integration-tests;./run-tests.sh policy

.PHONY: test
test: go-lint
Expand Down
5 changes: 3 additions & 2 deletions calico-vpp-agent/cmd/calico_vpp_dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/services"
"github.com/projectcalico/vpp-dataplane/config"

watchdog "github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watch_dog"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watchers"
)

Expand Down Expand Up @@ -136,7 +137,7 @@ func main() {
serviceServer := services.NewServiceServer(vpp, k8sclient, log.WithFields(logrus.Fields{"component": "services"}))
prometheusServer := prometheus.NewPrometheusServer(vpp, log.WithFields(logrus.Fields{"component": "prometheus"}))
localSIDWatcher := watchers.NewLocalSIDWatcher(vpp, clientv3, log.WithFields(logrus.Fields{"subcomponent": "localsid-watcher"}))
policyServer, err := policy.NewPolicyServer(vpp, log.WithFields(logrus.Fields{"component": "policy"}))
policyServer, err := policy.NewPolicyServer(vpp, log.WithFields(logrus.Fields{"component": "policy"}), true)
if err != nil {
log.Fatalf("Failed to create policy server %s", err)
}
Expand All @@ -154,7 +155,7 @@ func main() {
routingServer.SetBGPConf(bgpConf)
serviceServer.SetBGPConf(bgpConf)

watchDog := NewWatchDog(log.WithFields(logrus.Fields{"component": "watchDog"}), &t)
watchDog := watchdog.NewWatchDog(log.WithFields(logrus.Fields{"component": "watchDog"}), &t)
Go(policyServer.ServePolicy)
felixConfig := watchDog.Wait(policyServer.FelixConfigChan, "Waiting for FelixConfig to be provided by the calico pod")
ourBGPSpec := watchDog.Wait(policyServer.GotOurNodeBGPchan, "Waiting for bgp spec to be provided on node add")
Expand Down
342 changes: 52 additions & 290 deletions calico-vpp-agent/cni/cni_node_test.go
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 36 additions & 264 deletions calico-vpp-agent/cni/cni_pod_test.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading