fix(evpn-bridge): move ipu to intel e2000

Signed-off-by: Atul Patel <Atul.Patel@intel.com>
opiproject · Apr 25, 2024 · fb49701 · fb49701
1 parent a1e051b
commit fb49701
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -40,7 +40,7 @@ import (
 	"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"
-	ipu_linux "github.com/opiproject/opi-evpn-bridge/pkg/LinuxVendorModule/ipu"
+	intel_e2000_linux "github.com/opiproject/opi-evpn-bridge/pkg/LinuxVendorModule/intele2000"
 	frr "github.com/opiproject/opi-evpn-bridge/pkg/frr"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 )
@@ -63,9 +63,9 @@ var rootCmd = &cobra.Command{
 		go runGatewayServer(config.GlobalConfig.GRPCPort, config.GlobalConfig.HTTPPort)
 
 		switch config.GlobalConfig.Buildenv {
-		case "ipu":
+		case "intel_e2000":
 			gen_linux.Init()
-			ipu_linux.Init()
+			intel_e2000_linux.Init()
 			frr.Init()
 		case "ci":
 			gen_linux.Init()

diff --git a/config-ipu.yaml → config-intele2000.yaml b/config-ipu.yaml → config-intele2000.yaml
@@ -4,7 +4,7 @@ tlsfiles:
 database: redis
 dbaddress: 127.0.0.1:6379
 frraddress: 127.0.0.1
-buildenv: ipu
+buildenv: intel_e2000
 subscribers:
  - name: "lvm"
    priority: 2
@@ -15,7 +15,7 @@ subscribers:
  - name: "frr"
    priority: 3
    events: ["vrf", "svi"]
- - name: "ipu"
+ - name: "intel_e2000"
    priority: 4
    events: ["vrf"]
 grpc:

diff --git a/pkg/LinuxGeneralModule/lgm.go b/pkg/LinuxGeneralModule/lgm.go
@@ -526,7 +526,7 @@ func setUpVrf(vrf *infradb.Vrf) (string, bool) {
 		// Create bridge for external VXLAN under vrf
 		// Linux apparently creates a deterministic MAC address for a bridge type link with a given
 		// name. We need to assign a true random MAC address to avoid collisions when pairing two
-		// IPU servers.
+		// intel e2000 servers.
 
 		brErr := nlink.LinkAdd(ctx, &netlink.Bridge{
 			LinkAttrs: netlink.LinkAttrs{Name: brStr + vrf.Name},

diff --git a/pkg/LinuxVendorModule/ipu/ipu.go → ...inuxVendorModule/intele2000/intelE2000.go b/pkg/LinuxVendorModule/ipu/ipu.go → ...inuxVendorModule/intele2000/intelE2000.go
@@ -2,8 +2,8 @@
 // Copyright (c) 2022-2023 Intel Corporation, or its subsidiaries.
 // Copyright (C) 2023 Nordix Foundation.
 
-// Package ipu handles ipu vendor specific tasks
-package ipu
+// Package intele2000 handles intel e2000 vendor specific tasks
+package intele2000
 
 import (
 	"context"