resolve merge conflicts

Signed-off-by: h0nIg <[email protected]>

Author: h0nIg

plugins/meta/bandwidth/bandwidth_config_test.go

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

plugins/meta/bandwidth/bandwidth_linux_test.go

@@ -179,7 +179,7 @@ var _ = Describe("bandwidth test", func() {
 				})).To(Succeed())
 
 				// Container ingress (host egress)
-				Expect(hostNs.Do(func(_ ns.NetNS) error {
+				Expect(hostNs.Do(func(n ns.NetNS) error {
 					defer GinkgoRecover()
 
 					vethLink, err := netlink.LinkByName(hostIfname)
@@ -381,7 +381,7 @@ var _ = Describe("bandwidth test", func() {
 				})).To(Succeed())
 
 				// Container ingress (host egress)
-				Expect(hostNs.Do(func(_ ns.NetNS) error {
+				Expect(hostNs.Do(func(n ns.NetNS) error {
 					defer GinkgoRecover()
 
 					vethLink, err := netlink.LinkByName(hostIfname)
@@ -638,7 +638,7 @@ var _ = Describe("bandwidth test", func() {
 			})).To(Succeed())
 
 			// Container ingress (host egress)
-			Expect(hostNs.Do(func(_ ns.NetNS) error {
+			Expect(hostNs.Do(func(n ns.NetNS) error {
 				defer GinkgoRecover()
 
 				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
 			// only the qdisc ingress + a noqueue qdisc
-			Expect(hostNs.Do(func(_ ns.NetNS) error {
+			Expect(hostNs.Do(func(n ns.NetNS) error {
 				defer GinkgoRecover()
 
 				containerIfLink, err := netlink.LinkByName(hostIfname)
@@ -957,7 +957,7 @@ var _ = Describe("bandwidth test", func() {
 				return nil
 			})).To(Succeed())
 
-			Expect(hostNs.Do(func(_ ns.NetNS) error {
+			Expect(hostNs.Do(func(n ns.NetNS) error {
 				defer GinkgoRecover()
 
 				containerIfLink, err := netlink.LinkByName(hostIfname)
@@ -1133,7 +1133,7 @@ var _ = Describe("bandwidth test", func() {
 			})).To(Succeed())
 
 			// Container ingress (host egress)
-			Expect(hostNs.Do(func(_ ns.NetNS) error {
+			Expect(hostNs.Do(func(n ns.NetNS) error {
 				defer GinkgoRecover()
 
 				vethLink, err := netlink.LinkByName(hostIfname)