Commit 48445ee0 authored by Simon Pastor's avatar Simon Pastor
Browse files

lint issues fixed in sidecar

parent f205353d

go-apps/meep-tc-sidecar/main.go

+24 −50
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ import ( 
	"os/exec"

	"strings"

	"time"

	logrus "github.com/sirupsen/logrus"



	log "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-tc-sidecar/log"
@@ -187,28 +186,12 @@ func processLbMsg(payload string) { 


func refreshNetCharRules() {

	// Create shape rules

        start := time.Now()







	_ = initializeOnFirstPass()



	_ = createIfbs()

        elapsed := time.Since(start)

        log.WithFields(logrus.Fields{

                "meep.component":              "sidecar",

                "meep.time.location":          "createIfbs done",

                "meep.time.exec":              elapsed,

        }).Info("Time execution log")



	// Create new filters (lower priority than the old one)

	_ = createFilters()

        elapsed = time.Since(start)

        log.WithFields(logrus.Fields{

                "meep.component":              "sidecar",

                "meep.time.location":          "createFilters done",

                "meep.time.exec":              elapsed,

        }).Info("Time execution log")



	// // Delete unused filters

	deleteUnusedFilters()
@@ -558,6 +541,7 @@ func createIfbsHandler(key string, fields map[string]string, userData interface{ 


	return nil

}



/*

func flushFilters() {
@@ -754,7 +738,7 @@ func cmdDeleteFilter(ifbNumber string) error { 


func initializeOnFirstPass() error {



        if(firstTimePass == true) {

	if firstTimePass {

		_, err := cmdExec("tc qdisc replace dev eth0 root handle 1: netem")

		if err != nil {

			log.Info("Error: ", err)
@@ -773,8 +757,6 @@ func initializeOnFirstPass() error { 


func cmdCreateFilter(ifbNumber string, ipSrc string) {



//	start := time.Now()



	//"tc filter add dev eth0 parent ffff: protocol ip prio $ifbNumber u32 match ip src $ipsrc match u32 0 0 action mirred egress redirect dev $ifb$ifbnumber"

	str := "tc filter add dev eth0 parent ffff: protocol ip prio " + ifbNumber + " u32 match ip src " + ipSrc + " match u32 0 0 action mirred egress redirect dev ifb" + ifbNumber
@@ -786,14 +768,6 @@ func cmdCreateFilter(ifbNumber string, ipSrc string) { 
		log.Info("Error: ", err)

		return

	}

/*	elapsed := time.Since(start)

        log.WithFields(logrus.Fields{

                "meep.component":              "sidecar",

                "meep.time.location":          "cmdCreateFilter",

                "meep.time.exec":              elapsed,

		"meep.time.ifb":               ifbNumber,

        }).Info("Time execution log")

*/

}



func randSeq(n int) string {