Skip to content

Commit

Permalink
Enhance interface auto-detection for BPF (#9498)
Browse files Browse the repository at this point in the history
sridhartigera authored Dec 19, 2024
1 parent 222f120 commit 79e50f1
Showing 8 changed files with 789 additions and 183 deletions.
6 changes: 3 additions & 3 deletions felix/bpf/ut/attach_test.go
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ func runAttachTest(t *testing.T, ipv6Enabled bool) {
)
Expect(err).NotTo(HaveOccurred())

host1 := createVethName("hostep1")
host1 := createHostIf("hostep1")
defer deleteLink(host1)

workload0 := createVethName("workloadep0")
@@ -278,7 +278,7 @@ func runAttachTest(t *testing.T, ipv6Enabled bool) {
Expect(xdpProgs).To(HaveLen(0))
})

host2 := createVethName("hostep2")
host2 := createHostIf("hostep2")
defer deleteLink(host2)

t.Run("create another host interface without a host endpoint (no policy)", func(t *testing.T) {
@@ -848,7 +848,7 @@ func TestLogFilters(t *testing.T) {
)
Expect(err).NotTo(HaveOccurred())

host1 := createVethName("hostep1")
host1 := createHostIf("hostep1")
defer deleteLink(host1)

workload0 := createVethName("workloadep0")
12 changes: 12 additions & 0 deletions felix/bpf/ut/precompilation_test.go
Original file line number Diff line number Diff line change
@@ -94,6 +94,18 @@ func createVethName(name string) netlink.Link {
return veth
}

func createHostIf(name string) netlink.Link {
la := netlink.NewLinkAttrs()
la.Name = name
la.Flags = net.FlagUp
var hostIf netlink.Link = &netlink.Dummy{
LinkAttrs: la,
}
err := netlink.LinkAdd(hostIf)
ExpectWithOffset(1, err).NotTo(HaveOccurred(), fmt.Sprintf("failed to create test hostIf: %q", name))
return hostIf
}

func deleteLink(veth netlink.Link) {
err := netlink.LinkDel(veth)
Expect(err).NotTo(HaveOccurred(), "failed to delete test veth")
Loading

0 comments on commit 79e50f1

Please sign in to comment.