diff --git a/cmd/evpn/main.go b/cmd/evpn/main.go index db0d152..e03896a 100644 --- a/cmd/evpn/main.go +++ b/cmd/evpn/main.go @@ -4,6 +4,7 @@ // Copyright (C) 2023 Nordix Foundation. // Package main is the main package of the application +// //nolint:all package main @@ -40,7 +41,6 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - ci_linux "github.com/opiproject/opi-evpn-bridge/pkg/LinuxCIModule" gen_linux "github.com/opiproject/opi-evpn-bridge/pkg/LinuxGeneralModule" frr "github.com/opiproject/opi-evpn-bridge/pkg/frr" netlink "github.com/opiproject/opi-evpn-bridge/pkg/netlink" @@ -75,11 +75,6 @@ var rootCmd = &cobra.Command{ intel_e2000_linux.Initialize() frr.Initialize() ipu_vendor.Initialize() - - case "ci": - gen_linux.Initialize() - ci_linux.Initialize() - frr.Initialize() default: log.Panic(" ERROR: Could not find Build env ") } @@ -148,10 +143,6 @@ func cleanUp() { ipu_vendor.DeInitialize() close(p4driverapi.StopCh) - case "ci": - gen_linux.DeInitialize() - ci_linux.DeInitialize() - frr.DeInitialize() default: log.Panic(" ERROR: Could not find Build env ") } @@ -168,7 +159,6 @@ func main() { // initialize cobra config if err := initialize(); err != nil { - // log.Println(err) log.Panicf("Error in initialize(): %v", err) } @@ -190,9 +180,6 @@ func main() { default: fmt.Println("Received unknown signal.") } - // Perform any cleanup tasks here. - // ... - // Exit the program. os.Exit(0) }() diff --git a/go.mod b/go.mod index d489347..85b5494 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/ginkgo/v2 v2.14.0 github.com/opiproject/gospdk v0.0.0-20240415072512-98d71122a73b github.com/opiproject/opi-api v0.0.0-20240415072823-bb755a5f6ecc - github.com/opiproject/opi-evpn-bridge v0.2.1-0.20240708154942-708f94826a3a + github.com/opiproject/opi-evpn-bridge v0.2.1-0.20240902142753-8f51de196b54 github.com/opiproject/opi-smbios-bridge v0.1.3-0.20240113044816-4401aa6a3d1a github.com/opiproject/opi-spdk-bridge v0.1.2-0.20240417152307-a0f9ef0e5260 github.com/opiproject/opi-strongswan-bridge v0.1.2-0.20231211064623-e4ef0e4fa95f @@ -19,7 +19,6 @@ require ( github.com/philippgille/gokv/gomap v0.6.0 github.com/philippgille/gokv/redis v0.6.0 github.com/roman-kachanovsky/go-binary-pack v0.0.0-20170214094030-e260e0dc6732 - github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/vektra/mockery/v2 v2.38.0 @@ -30,8 +29,6 @@ require ( google.golang.org/protobuf v1.33.0 ) -replace github.com/opiproject/opi-evpn-bridge v0.2.1-0.20240708154942-708f94826a3a => github.com/mardim91/opi-evpn-bridge v0.0.0-20240801134324-5b73532d930c - require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect @@ -180,6 +177,7 @@ require ( github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect github.com/securego/gosec/v2 v2.18.2 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect github.com/sivchari/tenv v1.7.1 // indirect diff --git a/go.sum b/go.sum index 6c96970..2dbca66 100644 --- a/go.sum +++ b/go.sum @@ -406,8 +406,6 @@ github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= github.com/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04= github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc= -github.com/mardim91/opi-evpn-bridge v0.0.0-20240801134324-5b73532d930c h1:n082jp285SAAAalI2e1Myb76aR37paZdvNEfSsbSgFw= -github.com/mardim91/opi-evpn-bridge v0.0.0-20240801134324-5b73532d930c/go.mod h1:Lnt6BnGJEKm/poq+/blpIoyF8Fq8blkKc4kAcNCKlZ8= github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE= github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= @@ -461,6 +459,8 @@ github.com/opiproject/gospdk v0.0.0-20240415072512-98d71122a73b h1:SlDLubL/Bo0eh github.com/opiproject/gospdk v0.0.0-20240415072512-98d71122a73b/go.mod h1:9CMbTd9ptR6tl6HRRn8C33DPeWF85hTo4KZCa5iKftY= github.com/opiproject/opi-api v0.0.0-20240415072823-bb755a5f6ecc h1:iBcdnHiFFCIKggBDOL5S2OUONKyu8m+x/zhJGxIT2UY= github.com/opiproject/opi-api v0.0.0-20240415072823-bb755a5f6ecc/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= +github.com/opiproject/opi-evpn-bridge v0.2.1-0.20240902142753-8f51de196b54 h1:dBiCOF+XA5thXXULV5/UYma6CS3Q1VqvEF4OKsCmbrA= +github.com/opiproject/opi-evpn-bridge v0.2.1-0.20240902142753-8f51de196b54/go.mod h1:0SsCMInH7SAg4ML4aI/Ts8jt7iXyMmcqxBPUD3y4EgQ= github.com/opiproject/opi-smbios-bridge v0.1.3-0.20240113044816-4401aa6a3d1a h1:JHNZJxcoWvrcoxyPRXLKEciaEZ5Dfsd6RQYd9km9MSM= github.com/opiproject/opi-smbios-bridge v0.1.3-0.20240113044816-4401aa6a3d1a/go.mod h1:QhKBKdPcS25fDW89Rcsw9N1c07hdcj8OXsr2c+PgeIg= github.com/opiproject/opi-spdk-bridge v0.1.2-0.20240417152307-a0f9ef0e5260 h1:bUzUhKxcC8k6MaApN2XSeYB6frZ0uubPcZjPvLBRG1E= diff --git a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4driverapi/p4ctl.go b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4driverapi/p4ctl.go index ec0f9c0..33febf2 100644 --- a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4driverapi/p4ctl.go +++ b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4driverapi/p4ctl.go @@ -3,6 +3,7 @@ // Copyright (C) 2023 Nordix Foundation. // Package p4driverapi handles p4 driver realted functionality +// //nolint:all package p4driverapi @@ -11,15 +12,12 @@ import ( "context" "encoding/binary" - // "encoding/hex" "fmt" "net" - // "strings" "log" "time" - logr "github.com/sirupsen/logrus" "google.golang.org/grpc" p4_v1 "github.com/p4lang/p4runtime/go/p4/v1" @@ -90,30 +88,24 @@ func Buildmfs(tablefield TableField) (map[string]client.MatchInterface, bool, er case net.HardwareAddr: mfs[key] = &client.ExactMatch{Value: value[0].(net.HardwareAddr)} case uint16: - // if value[1].(string) == lpmStr { switch value[1].(string) { case lpmStr: mfs[key] = &client.LpmMatch{Value: uint16toBytes(value[0].(uint16)), PLen: 31} - // } else if value[1].(string) == ternaryStr { case ternaryStr: isTernary = true mfs[key] = &client.TernaryMatch{Value: uint16toBytes(value[0].(uint16)), Mask: uint32toBytes(4294967295)} - // } else { default: mfs[key] = &client.ExactMatch{Value: uint16toBytes(value[0].(uint16))} } case *net.IPNet: maskSize, _ := v.Mask.Size() ip := v.IP.To4() - // if value[1].(string) == lpmStr { switch value[1].(string) { case lpmStr: mfs[key] = &client.LpmMatch{Value: v.IP.To4(), PLen: int32(maskSize)} - // } else if value[1].(string) == ternaryStr { case ternaryStr: isTernary = true mfs[key] = &client.TernaryMatch{Value: []byte(ip), Mask: uint32toBytes(4294967295)} - // } else { default: mfs[key] = &client.ExactMatch{Value: []byte(ip)} } @@ -123,11 +115,9 @@ func Buildmfs(tablefield TableField) (map[string]client.MatchInterface, bool, er case lpmStr: mfs[key] = &client.LpmMatch{Value: value[0].(net.IP).To4(), PLen: 24} - // } else if value[1].(string) == ternaryStr { case ternaryStr: isTernary = true mfs[key] = &client.TernaryMatch{Value: []byte(v), Mask: uint32toBytes(4294967295)} - // } else { default: mfs[key] = &client.ExactMatch{Value: []byte(v)} } @@ -138,11 +128,9 @@ func Buildmfs(tablefield TableField) (map[string]client.MatchInterface, bool, er case lpmStr: mfs[key] = &client.LpmMatch{Value: uint32toBytes(value[0].(uint32)), PLen: 31} - // } else if value[1].(string) == ternaryStr { case ternaryStr: isTernary = true mfs[key] = &client.TernaryMatch{Value: uint32toBytes(value[0].(uint32)), Mask: uint32toBytes(4294967295)} - // } else { default: mfs[key] = &client.ExactMatch{Value: uint32toBytes(value[0].(uint32))} } @@ -179,15 +167,6 @@ func DelEntry(entry TableEntry) error { return P4RtC.DeleteTableEntry(Ctx, entryP) } -/*// mustMarshal marshal the msg -func mustMarshal(msg proto.Message) []byte { - data, err := proto.Marshal(msg) - if err != nil { - panic(err) // You should handle errors appropriately in your code - } - return data -}*/ - // AddEntry adds an entry func AddEntry(entry TableEntry) error { Options := &client.TableEntryOptions{ @@ -237,16 +216,6 @@ func AddEntry(entry TableEntry) error { return P4RtC.InsertTableEntry(Ctx, entryP) } -/* -// encodeMac encodes the mac from string - - func encodeMac(macAddrString string) []byte { - str := strings.Replace(macAddrString, ":", "", -1) - decoded, _ := hex.DecodeString(str) - return decoded - } -*/ - // StopCh is used to when to stop the p4rtc when a terminate signal is generated var StopCh = make(chan struct{}) @@ -256,10 +225,10 @@ func NewP4RuntimeClient(binPath string, p4infoPath string, conn *grpc.ClientConn c := p4_v1.NewP4RuntimeClient(conn) resp, err := c.Capabilities(Ctx, &p4_v1.CapabilitiesRequest{}) if err != nil { - logr.Fatalf("intel-e2000: Error in Capabilities RPC: %v", err) + log.Printf("intel-e2000: Error in Capabilities RPC: %v", err) return err } - logr.Infof("intel-e2000: P4Runtime server version is %s", resp.P4RuntimeApiVersion) + log.Printf("intel-e2000: P4Runtime server version is %s", resp.P4RuntimeApiVersion) electionID := &p4_v1.Uint128{High: 0, Low: 1} @@ -277,13 +246,13 @@ func NewP4RuntimeClient(binPath string, p4infoPath string, conn *grpc.ClientConn sent := false for isPrimary := range arbitrationCh { if isPrimary { - logr.Infof("We are the primary client!") + log.Println("We are the primary client!") if !sent { waitCh <- struct{}{} sent = true } } else { - logr.Infof("We are not the primary client!") + log.Println("We are not the primary client!") } } }() @@ -294,15 +263,15 @@ func NewP4RuntimeClient(binPath string, p4infoPath string, conn *grpc.ClientConn defer cancel() select { case <-Ctx2.Done(): - logr.Fatalf("Could not become the primary client within %v", timeout) + log.Fatal("Could not become the primary client within ", timeout) case <-errs: - logr.Fatalf("Could not get the client within %v", timeout) + log.Fatal("Could not get the client within ", timeout) case <-waitCh: } }() - logr.Info("Setting forwarding pipe") + log.Println("Setting forwarding pipe") if _, err := P4RtC.SetFwdPipe(Ctx, binPath, p4infoPath, 0); err != nil { - logr.Fatalf("Error when setting forwarding pipe: %v", err) + log.Fatal("Error when setting forwarding pipe: ", err) return err } return nil diff --git a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/dcgw.go b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/dcgw.go index 039ad20..27a8d41 100644 --- a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/dcgw.go +++ b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/dcgw.go @@ -1,6 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright (c) 2022-2023 Intel Corporation, or its subsidiaries. // Copyright (C) 2023 Nordix Foundation. +// //nolint:all package p4translation @@ -548,10 +549,6 @@ const ( ) -/*func setMuxVsi(representors map[string]string) string{ - var muxVsi:= representors["vrf_mux"][0] - return muxVsi -}*/ // _isL3vpnEnabled check if l3 enabled func _isL3vpnEnabled(vrf *infradb.Vrf) bool { return vrf.Spec.Vni != nil @@ -578,19 +575,6 @@ func _bigEndian16(id interface{}) interface{} { return unpackedData } -/*// _bigEndian32 convert to big endian 32bit -func _bigEndian32(id interface{}) interface{} { - var bp = new(binarypack.BinaryPack) - var packFormat = []string{"I"} - var value = []interface{}{id} - var packedData, err = bp.Pack(packFormat, value) - if err != nil { - log.Printf("intel-e2000: error: %v\n",err) - } - var unpackedData = binary.BigEndian.Uint32(packedData) - return unpackedData -}*/ - // _toEgressVsi convert to vsi+16 func _toEgressVsi(vsiID int) int { return vsiID + 16 @@ -996,11 +980,6 @@ func (l L3Decoder) translateAddedRoute(route netlink_polling.RouteStruct) []inte return l._l3Route(route, "False") } -/*// translateChangedRoute translate the changed route to p4 entries -func (l L3Decoder) translateChangedRoute(route netlink_polling.RouteStruct) []interface{} { - return l.translateAddedRoute(route) -}*/ - // translateDeletedRoute translate the deleted route to p4 entries func (l L3Decoder) translateDeletedRoute(route netlink_polling.RouteStruct) []interface{} { var ipv4Net = route.Route0.Dst @@ -1028,7 +1007,6 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) switch nexthop.NhType { case netlink_polling.PHY: - // if nexthop.NhType == netlink_polling.PHY { var smac, _ = net.ParseMAC(nexthop.Metadata["smac"].(string)) var dmac, _ = net.ParseMAC(nexthop.Metadata["dmac"].(string)) var portID = nexthop.Metadata["egress_vport"] @@ -1088,7 +1066,6 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) Params: []interface{}{uint16(portID.(int))}, }, }) - // } else if nexthop.NhType == netlink_polling.ACC { case netlink_polling.ACC: var dmac, _ = net.ParseMAC(nexthop.Metadata["dmac"].(string)) var vlanID = nexthop.Metadata["vlanID"].(uint32) @@ -1120,7 +1097,6 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) Params: []interface{}{modPtr, uint32(vport)}, }, }) - // } else if nexthop.NhType == netlink_polling.SVI { case netlink_polling.SVI: var smac, _ = net.ParseMAC(nexthop.Metadata["smac"].(string)) var dmac, _ = net.ParseMAC(nexthop.Metadata["dmac"].(string)) @@ -1161,7 +1137,6 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) Params: []interface{}{modPtr, uint32(vport)}, }, }) - // } else if Type == ipuDB.ACCESS { case infradb.Access: entries = append(entries, p4client.TableEntry{ Tablename: macMod, @@ -1190,11 +1165,9 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) Params: []interface{}{modPtr, uint32(vport)}, }, }) - // } else { default: return entries } - // } else { default: return entries } @@ -1202,12 +1175,9 @@ func (l L3Decoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruct) return entries } -/*// translateChangedNexthop translate the changed nexthop to p4 entries -func (l L3Decoder) translateChangedNexthop(nexthop netlink_polling.NexthopStruct) []interface{} { - return l.translateAddedNexthop(nexthop) -}*/ -//nolint:funlen // translateDeletedNexthop translate the deleted nexthop to p4 entries +// +//nolint:funlen func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct) []interface{} { if nexthop.NhType == netlink_polling.VXLAN { var entries []interface{} @@ -1220,7 +1190,6 @@ func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct var entries = make([]interface{}, 0) switch nexthop.NhType { case netlink_polling.PHY: - // if nexthop.NhType == netlink_polling.PHY { entries = append(entries, p4client.TableEntry{ Tablename: macMod, TableField: p4client.TableField{ @@ -1260,7 +1229,6 @@ func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct Priority: int32(0), }, }) - // } else if nexthop.NhType == netlink_polling.ACC { case netlink_polling.ACC: entries = append(entries, p4client.TableEntry{ Tablename: pushDmacVlan, @@ -1281,12 +1249,10 @@ func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct Priority: int32(0), }, }) - // } else if nexthop.NhType == netlink_polling.SVI { case netlink_polling.SVI: var Type = nexthop.Metadata["portType"].(infradb.BridgePortType) switch Type { case infradb.Trunk: - // if Type == ipuDB.TRUNK { entries = append(entries, p4client.TableEntry{ Tablename: pushMacVlan, TableField: p4client.TableField{ @@ -1306,7 +1272,6 @@ func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct Priority: int32(0), }, }) - // } else if Type == ipuDB.ACCESS { case infradb.Access: entries = append(entries, p4client.TableEntry{ Tablename: macMod, @@ -1327,11 +1292,9 @@ func (l L3Decoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct Priority: int32(0), }, }) - // } else { default: return entries } - // } else { default: return entries } @@ -1810,11 +1773,6 @@ func (v VxlanDecoder) translateAddedNexthop(nexthop netlink_polling.NexthopStruc return entries } -/*// translateChangedNexthop translates the changed nexthop -func (v VxlanDecoder) translateChangedNexthop(nexthop netlink_polling.NexthopStruct) []interface{} { - return v.translateAddedNexthop(nexthop) -}*/ - // translateDeletedNexthop translates the deleted nexthop func (v VxlanDecoder) translateDeletedNexthop(nexthop netlink_polling.NexthopStruct) []interface{} { var entries = make([]interface{}, 0) @@ -1920,11 +1878,6 @@ func (v VxlanDecoder) translateAddedL2Nexthop(nexthop netlink_polling.L2NexthopS return entries } -/*// translateChangedL2Nexthop translates the changed l2 nexthop -func (v VxlanDecoder) translateChangedL2Nexthop(nexthop netlink_polling.L2NexthopStruct) []interface{} { - return v.translateAddedL2Nexthop(nexthop) -}*/ - // translateDeletedL2Nexthop translates the deleted l2 nexthop func (v VxlanDecoder) translateDeletedL2Nexthop(nexthop netlink_polling.L2NexthopStruct) []interface{} { var entries = make([]interface{}, 0) @@ -1993,11 +1946,6 @@ func (v VxlanDecoder) translateAddedFdb(fdb netlink_polling.FdbEntryStruct) []in return entries } -/*// translateChangedFdb translates the changed fdb entry -func (v VxlanDecoder) translateChangedFdb(fdb netlink_polling.FdbEntryStruct) []interface{} { - return v.translateAddedFdb(fdb) -}*/ - // translateDeletedFdb translates the deleted fdb entry func (v VxlanDecoder) translateDeletedFdb(fdb netlink_polling.FdbEntryStruct) []interface{} { var entries = make([]interface{}, 0) @@ -2712,11 +2660,6 @@ func (p PodDecoder) translateAddedFdb(fdb netlink_polling.FdbEntryStruct) []inte return entries } -/*// translateChangedFdb translate the changed fdb entry -func (p PodDecoder) translateChangedFdb(fdb netlink_polling.FdbEntryStruct) []interface{} { - return p.translateAddedFdb(fdb) -}*/ - // translateDeletedFdb translate the deleted fdb entry func (p PodDecoder) translateDeletedFdb(fdb netlink_polling.FdbEntryStruct) []interface{} { var entries = make([]interface{}, 0) @@ -2805,11 +2748,6 @@ func (p PodDecoder) translateAddedL2Nexthop(nexthop netlink_polling.L2NexthopStr return entries } -/*// translateChangedL2Nexthop translate the changed l2 nexthop entry -func (p PodDecoder) translateChangedL2Nexthop(nexthop netlink_polling.L2NexthopStruct) []interface{} { - return p.translateAddedL2Nexthop(nexthop) -}*/ - // translateDeletedL2Nexthop translate the deleted l2 nexthop entry func (p PodDecoder) translateDeletedL2Nexthop(nexthop netlink_polling.L2NexthopStruct) []interface{} { var entries = make([]interface{}, 0) @@ -2886,20 +2824,7 @@ func (p PodDecoder) StaticAdditions() []interface{} { Params: []interface{}{uint32(_toEgressVsi(p._portMuxVsi))}, }, }, - /*p4client.TableEntry{ - Tablename: portMuxIn, - TableField: p4client.TableField{ - FieldValue: map[string][2]interface{}{ - "vsi": {uint16(p._portMuxVsi), "exact"}, - "vid": {Vlan.PHY0, "exact"}, - }, - Priority: int32(0), - }, - Action: p4client.Action{ - ActionName: "linux_networking_control.set_def_vsi_loopback", - Params: []interface{}{uint32(0)}, - }, - },*/ + p4client.TableEntry{ Tablename: l2FwdLoop, TableField: p4client.TableField{ @@ -2972,16 +2897,7 @@ func (p PodDecoder) StaticDeletions() []interface{} { Priority: int32(0), }, }, - /*p4client.TableEntry{ - Tablename: portMuxIn, - TableField: p4client.TableField{ - FieldValue: map[string][2]interface{}{ - "vsi": {uint16(p._portMuxVsi), "exact"}, - "vid": {Vlan.PHY0, "exact"}, - }, - Priority: int32(0), - }, - },*/ + p4client.TableEntry{ Tablename: l2FwdLoop, TableField: p4client.TableField{ diff --git a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/p4trans.go b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/p4trans.go index 22fb876..8b23589 100644 --- a/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/p4trans.go +++ b/pkg/evpn/vendor_plugins/intel-e2000/p4runtime/p4translation/p4trans.go @@ -3,6 +3,7 @@ // Copyright (C) 2023 Nordix Foundation. // Package p4translation handles the intel e2000 fast path configuration +// //nolint:all package p4translation @@ -941,7 +942,6 @@ func setUpLb(lb *infradb.LogicalBridge) bool { // setUpBp set up the bridge port func setUpBp(bp *infradb.BridgePort) bool { - // var entries []interface{} entries, err := Pod.translateAddedBp(bp) if err != nil { return false @@ -962,7 +962,6 @@ func setUpBp(bp *infradb.BridgePort) bool { // setUpSvi set up the svi func setUpSvi(svi *infradb.Svi) bool { - // var entries []interface{} entries, err := Pod.translateAddedSvi(svi) if err != nil { return false @@ -986,7 +985,6 @@ func tearDownVrf(vrf *infradb.Vrf) bool { if path.Base(vrf.Name) == grdStr { return true } - // var entries []interface{} entries := Vxlan.translateDeletedVrf(vrf) for _, entry := range entries { if e, ok := entry.(p4client.TableEntry); ok { @@ -1004,7 +1002,6 @@ func tearDownVrf(vrf *infradb.Vrf) bool { // tearDownLb tear down the logical bridge func tearDownLb(lb *infradb.LogicalBridge) bool { - // var entries []interface{} entries := Vxlan.translateDeletedLb(lb) for _, entry := range entries { if e, ok := entry.(p4client.TableEntry); ok { @@ -1022,7 +1019,6 @@ func tearDownLb(lb *infradb.LogicalBridge) bool { // tearDownBp tear down the bridge port func tearDownBp(bp *infradb.BridgePort) bool { - // var entries []interface{} entries, err := Pod.translateDeletedBp(bp) if err != nil { return false @@ -1043,7 +1039,6 @@ func tearDownBp(bp *infradb.BridgePort) bool { // tearDownSvi tear down the svi func tearDownSvi(svi *infradb.Svi) bool { - // var entries []interface{} entries, err := Pod.translateDeletedSvi(svi) if err != nil { return false @@ -1111,7 +1106,6 @@ func Initialize() { L3 = L3.L3DecoderInit(representors) Pod = Pod.PodDecoderInit(representors) - // decoders = []interface{}{L3, Vxlan, Pod} Vxlan = Vxlan.VxlanDecoderInit(representors) L3entries := L3.StaticAdditions() for _, entry := range L3entries {