Replace FW Filters with Flower filters (#963)

* Add a AddFlowerFilter method

* Update unit tests

* Remove AddFwFilter

Author: ptnapoleon

injector/network_disruption.go

@@ -490,8 +490,8 @@ func (i *networkDisruptionInjector) applyOperations() error {
 				return fmt.Errorf("could not update the configuration of the bpf-network-tc-filter filter: %w", err)
 			}
 
-			// create fw filter to classify packets based on their mark
-			if err := i.config.TrafficController.AddFwFilter(interfaces, "4:0", types.InjectorCgroupClassID, "4:2"); err != nil {
+			// create flower filter to classify packets based on their mark
+			if err := i.config.TrafficController.AddFlowerFilter(interfaces, "4:0", types.InjectorCgroupClassID, "4:2"); err != nil {
 				return fmt.Errorf("can't create the fw filter: %w", err)
 			}
 
@@ -505,8 +505,8 @@ func (i *networkDisruptionInjector) applyOperations() error {
 				return fmt.Errorf("can't create a new qdisc: %w", err)
 			}
 
-			// create fw filter to classify packets based on their mark
-			if err := i.config.TrafficController.AddFwFilter(interfaces, "2:0", types.InjectorCgroupClassID, "2:2"); err != nil {
+			// create flower filter to classify packets based on their mark
+			if err := i.config.TrafficController.AddFlowerFilter(interfaces, "2:0", types.InjectorCgroupClassID, "2:2"); err != nil {
 				return fmt.Errorf("can't create the fw filter: %w", err)
 			}
 			// parent 2:2 refers to the 2nd band of the 2nd prio qdisc

injector/network_disruption_test.go

@@ -92,7 +92,7 @@ var _ = Describe("Failure", func() {
 		tc.EXPECT().AddNetem(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
 		tc.EXPECT().AddPrio(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
 		tc.EXPECT().AddFilter(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(0, nil).Maybe()
-		tc.EXPECT().AddFwFilter(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
+		tc.EXPECT().AddFlowerFilter(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
 		tc.EXPECT().AddOutputLimit(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
 		tc.EXPECT().DeleteFilter(mock.Anything, mock.Anything).Return(nil).Maybe()
 		tc.EXPECT().ClearQdisc(mock.Anything).Return(nil).Maybe()
@@ -294,7 +294,7 @@ var _ = Describe("Failure", func() {
 		})
 
 		It("should add an fw filter to classify packets according to their classid set by iptables mark", func() {
-			tc.AssertCalled(GinkgoT(), "AddFwFilter", []string{"lo", "eth0", "eth1"}, "2:0", "0x00020002", "2:2")
+			tc.AssertCalled(GinkgoT(), "AddFlowerFilter", []string{"lo", "eth0", "eth1"}, "2:0", "0x00020002", "2:2")
 		})
 
 		It("should apply disruptions to main interfaces 2nd band", func() {
@@ -720,7 +720,7 @@ var _ = Describe("Failure", func() {
 					tc.AssertCalled(GinkgoT(), "AddPrio", interfaces, "3:2", "4:", uint32(2), mock.Anything)
 
 					By("adding an fw filter to classify packets according to their classid set by iptables mark")
-					tc.AssertCalled(GinkgoT(), "AddFwFilter", interfaces, "4:0", "0x00020002", "4:2")
+					tc.AssertCalled(GinkgoT(), "AddFlowerFilter", interfaces, "4:0", "0x00020002", "4:2")
 
 					By("adding an BPF filter to classify packets according to their method")
 					tc.AssertCalled(GinkgoT(), "AddBPFFilter", interfaces, "2:0", "/usr/local/bin/bpf-network-tc-filter.bpf.o", "2:2", "classifier_methods")

network/tc.go

@@ -61,7 +61,7 @@ type TrafficController interface {
 	AddPrio(ifaces []string, parent string, handle string, bands uint32, priomap [16]uint32) error
 	AddFilter(ifaces []string, parent string, handle string, srcIP, dstIP *net.IPNet, srcPort, dstPort int, prot protocol, state connState, flowid string) (uint32, error)
 	DeleteFilter(iface string, priority uint32) error
-	AddFwFilter(ifaces []string, parent string, handle string, flowid string) error
+	AddFlowerFilter(ifaces []string, parent string, handle string, flowid string) error
 	AddBPFFilter(ifaces []string, parent string, obj string, flowid string, section string) error
 	ConfigBPFFilter(cmd executor, args ...string) error
 	AddOutputLimit(ifaces []string, parent string, handle string, bytesPerSec uint) error
@@ -251,10 +251,10 @@ func (t *tc) DeleteFilter(iface string, priority uint32) error {
 	return nil
 }
 
-// AddFwFilter generates a cgroup filter
-func (t *tc) AddFwFilter(ifaces []string, parent string, handle string, flowid string) error {
+// AddFlowerFilter generates a tc filter of kind "flower"
+func (t *tc) AddFlowerFilter(ifaces []string, parent string, handle string, flowid string) error {
 	for _, iface := range ifaces {
-		if _, _, err := t.executer.Run(buildCmd("filter", iface, parent, "ip", 0, handle, "fw", "flowid "+flowid)); err != nil {
+		if _, _, err := t.executer.Run(buildCmd("filter", iface, parent, "ip", 0, handle, "flower", "flowid "+flowid)); err != nil {
 			return err
 		}
 	}

network/tc_test.go

@@ -212,14 +212,14 @@ var _ = Describe("Tc", func() {
 		})
 	})
 
-	Describe("AddFwFilter", func() {
+	Describe("AddFlowerFilter", func() {
 		JustBeforeEach(func() {
-			Expect(tcRunner.AddFwFilter(ifaces, parent, handle, flowid)).Should(Succeed())
+			Expect(tcRunner.AddFlowerFilter(ifaces, parent, handle, flowid)).Should(Succeed())
 		})
 
 		Context("add a cgroup filter", func() {
 			It("should execute", func() {
-				tcExecuter.AssertCalled(GinkgoT(), "Run", []string{"filter", "add", "dev", "lo", "protocol", "ip", "root", "fw", "flowid", "1:2"})
+				tcExecuter.AssertCalled(GinkgoT(), "Run", []string{"filter", "add", "dev", "lo", "protocol", "ip", "root", "flower", "flowid", "1:2"})
 			})
 		})
 	})