ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

resolve merge conflicts

Browse Source 
Signed-off-by: h0nIg <h0nIg@users.noreply.github.com>
This commit is contained in:
h0nIg 2024-10-11 10:03:42 +00:00 committed by Casey Callendrello
parent 8324a2e5a4
commit 8ad0361964
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/meta/bandwidth/bandwidth_config_test.go
View File

@ -117,7 +117,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -166,7 +166,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -216,7 +216,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -264,7 +264,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -312,7 +312,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
@ -371,7 +371,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -454,7 +454,7 @@ var _ = Describe("bandwidth config test", func() {
})).To(Succeed()) })).To(Succeed())
// Container ingress (host egress) // Container ingress (host egress)
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
vethLink, err := netlink.LinkByName(hostIfname) vethLink, err := netlink.LinkByName(hostIfname)
@ -520,7 +520,7 @@ var _ = Describe("bandwidth config test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(netNS ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })

12
plugins/meta/bandwidth/bandwidth_linux_test.go
View File

@ -179,7 +179,7 @@ var _ = Describe("bandwidth test", func() {
})).To(Succeed()) })).To(Succeed())
// Container ingress (host egress) // Container ingress (host egress)
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
vethLink, err := netlink.LinkByName(hostIfname) vethLink, err := netlink.LinkByName(hostIfname)
@ -381,7 +381,7 @@ var _ = Describe("bandwidth test", func() {
})).To(Succeed()) })).To(Succeed())
// Container ingress (host egress) // Container ingress (host egress)
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
vethLink, err := netlink.LinkByName(hostIfname) vethLink, err := netlink.LinkByName(hostIfname)
@ -638,7 +638,7 @@ var _ = Describe("bandwidth test", func() {
})).To(Succeed()) })).To(Succeed())
// Container ingress (host egress) // Container ingress (host egress)
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
vethLink, err := netlink.LinkByName(hostIfname) vethLink, err := netlink.LinkByName(hostIfname)
@ -888,7 +888,7 @@ var _ = Describe("bandwidth test", func() {
// check container ingress side / host egress side, we should not have any htb qdisc/classes/filters defined for the host veth // check container ingress side / host egress side, we should not have any htb qdisc/classes/filters defined for the host veth
// only the qdisc ingress + a noqueue qdisc // only the qdisc ingress + a noqueue qdisc
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
containerIfLink, err := netlink.LinkByName(hostIfname) containerIfLink, err := netlink.LinkByName(hostIfname)
@ -957,7 +957,7 @@ var _ = Describe("bandwidth test", func() {
return nil return nil
})).To(Succeed()) })).To(Succeed())
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
containerIfLink, err := netlink.LinkByName(hostIfname) containerIfLink, err := netlink.LinkByName(hostIfname)
@ -1133,7 +1133,7 @@ var _ = Describe("bandwidth test", func() {
})).To(Succeed()) })).To(Succeed())
// Container ingress (host egress) // Container ingress (host egress)
Expect(hostNs.Do(func(_ ns.NetNS) error { Expect(hostNs.Do(func(n ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
vethLink, err := netlink.LinkByName(hostIfname) vethLink, err := netlink.LinkByName(hostIfname)