Delete engine and flatten dataplane directory (#337)

* Delete engine and flatten dataplane directory * fixes * fix * lint
openconfig · Dec 5, 2023 · d3339c7 · d3339c7
1 parent 3a07f23
commit d3339c7
Show file tree

Hide file tree

Showing 191 changed files with 38,890 additions and 39,083 deletions.
diff --git a/.github/linters/.protolintrc.yml b/.github/linters/.protolintrc.yml
@@ -2,4 +2,4 @@ lint:
   directories:
     # The SAI generated proto doesn't follow all the proto naming conventions.
     exclude:
-      - dataplane/standalone/proto
+      - dataplane/proto
diff --git a/dataplane/BUILD b/dataplane/BUILD
@@ -10,9 +10,9 @@ go_library(
     importpath = "github.com/openconfig/lemming/dataplane",
     visibility = ["//visibility:public"],
     deps = [
-        "//dataplane/standalone/proto:sai",
-        "//dataplane/standalone/saiserver",
-        "//dataplane/standalone/saiserver/attrmgr",
+        "//dataplane/proto:sai",
+        "//dataplane/saiserver",
+        "//dataplane/saiserver/attrmgr",
         "//gnmi/oc",
         "//gnmi/reconciler",
         "@com_github_openconfig_gnmi//proto/gnmi",

diff --git a/dataplane/standalone/apigen/BUILD → dataplane/apigen/BUILD b/dataplane/standalone/apigen/BUILD → dataplane/apigen/BUILD
@@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 go_library(
     name = "apigen_lib",
     srcs = ["apigen.go"],
-    importpath = "github.com/openconfig/lemming/dataplane/standalone/apigen",
+    importpath = "github.com/openconfig/lemming/dataplane/apigen",
     visibility = ["//visibility:private"],
     deps = [
-        "//dataplane/standalone/apigen/ccgen",
-        "//dataplane/standalone/apigen/docparser",
-        "//dataplane/standalone/apigen/protogen",
-        "//dataplane/standalone/apigen/saiast",
+        "//dataplane/apigen/ccgen",
+        "//dataplane/apigen/docparser",
+        "//dataplane/apigen/protogen",
+        "//dataplane/apigen/saiast",
         "@org_modernc_cc_v4//:cc",
     ],
 )

diff --git a/dataplane/standalone/apigen/README.md → dataplane/apigen/README.md b/dataplane/standalone/apigen/README.md → dataplane/apigen/README.md
diff --git a/dataplane/standalone/apigen/apigen.go → dataplane/apigen/apigen.go b/dataplane/standalone/apigen/apigen.go → dataplane/apigen/apigen.go
@@ -21,10 +21,10 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/ccgen"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/docparser"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/protogen"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/saiast"
+	"github.com/openconfig/lemming/dataplane/apigen/ccgen"
+	"github.com/openconfig/lemming/dataplane/apigen/docparser"
+	"github.com/openconfig/lemming/dataplane/apigen/protogen"
+	"github.com/openconfig/lemming/dataplane/apigen/saiast"
 
 	cc "modernc.org/cc/v4"
 )
@@ -52,7 +52,7 @@ func parse(headers []string, includePaths ...string) (*cc.AST, error) {
 const (
 	saiPath     = "bazel-lemming/external/com_github_opencomputeproject_sai"
 	ccOutDir    = "dataplane/standalone/sai"
-	protoOutDir = "dataplane/standalone/proto"
+	protoOutDir = "dataplane/proto"
 )
 
 func generate() error {
@@ -92,12 +92,12 @@ func generate() error {
 	}
 
 	for file, content := range protos {
-		if err := os.WriteFile(filepath.Join(protoOutDir, file), []byte(content), 0600); err != nil {
+		if err := os.WriteFile(filepath.Join(protoOutDir, file), []byte(content), 0o600); err != nil {
 			return err
 		}
 	}
 	for file, content := range ccFiles {
-		if err := os.WriteFile(filepath.Join(ccOutDir, file), []byte(content), 0600); err != nil {
+		if err := os.WriteFile(filepath.Join(ccOutDir, file), []byte(content), 0o600); err != nil {
 			return err
 		}
 	}

diff --git a/dataplane/apigen/ccgen/BUILD b/dataplane/apigen/ccgen/BUILD
@@ -0,0 +1,14 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "ccgen",
+    srcs = ["ccgen.go"],
+    importpath = "github.com/openconfig/lemming/dataplane/apigen/ccgen",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//dataplane/apigen/docparser",
+        "//dataplane/apigen/protogen",
+        "//dataplane/apigen/saiast",
+        "@com_github_stoewer_go_strcase//:go-strcase",
+    ],
+)
diff --git a/dataplane/standalone/apigen/ccgen/ccgen.go → dataplane/apigen/ccgen/ccgen.go b/dataplane/standalone/apigen/ccgen/ccgen.go → dataplane/apigen/ccgen/ccgen.go
@@ -22,9 +22,9 @@ import (
 
 	strcase "github.com/stoewer/go-strcase"
 
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/docparser"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/protogen"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/saiast"
+	"github.com/openconfig/lemming/dataplane/apigen/docparser"
+	"github.com/openconfig/lemming/dataplane/apigen/protogen"
+	"github.com/openconfig/lemming/dataplane/apigen/saiast"
 )
 
 // Generate generates the C++ code for the SAI library.
@@ -598,8 +598,8 @@ switch ({{ .Var }}) {
 #include "dataplane/standalone/sai/{{ .Header }}"
 #include <glog/logging.h>
 #include "dataplane/standalone/sai/common.h"
-#include "dataplane/standalone/proto/common.pb.h"
-#include "dataplane/standalone/proto/{{ .ProtoInclude }}.h"
+#include "dataplane/proto/common.pb.h"
+#include "dataplane/proto/{{ .ProtoInclude }}.h"
 
 const {{ .APIType }} l_{{ .APIName }} = {
 {{- range .Funcs }}

diff --git a/dataplane/standalone/apigen/docparser/BUILD → dataplane/apigen/docparser/BUILD b/dataplane/standalone/apigen/docparser/BUILD → dataplane/apigen/docparser/BUILD
@@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "docparser",
     srcs = ["docparser.go"],
-    importpath = "github.com/openconfig/lemming/dataplane/standalone/apigen/docparser",
+    importpath = "github.com/openconfig/lemming/dataplane/apigen/docparser",
     visibility = ["//visibility:public"],
 )
diff --git a/.../standalone/apigen/docparser/docparser.go → dataplane/apigen/docparser/docparser.go b/.../standalone/apigen/docparser/docparser.go → dataplane/apigen/docparser/docparser.go
@@ -100,7 +100,7 @@ type SimpleSect struct {
 	Para string `xml:"para"`
 }
 
-const xmlPath = "dataplane/standalone/apigen/xml"
+const xmlPath = "dataplane/apigen/xml"
 
 // ParseSAIXMLDir parses all the SAI Doxygen XML files in a directory.
 func ParseSAIXMLDir() (*SAIInfo, error) {
@@ -113,6 +113,9 @@ func ParseSAIXMLDir() (*SAIInfo, error) {
 		return nil, err
 	}
 	for _, file := range files {
+		if !strings.HasSuffix(file.Name(), "xml") {
+			continue
+		}
 		if err := parseXMLFile(filepath.Join(xmlPath, file.Name()), i); err != nil {
 			return nil, err
 		}

diff --git a/dataplane/standalone/apigen/protogen/BUILD → dataplane/apigen/protogen/BUILD b/dataplane/standalone/apigen/protogen/BUILD → dataplane/apigen/protogen/BUILD
@@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "protogen",
     srcs = ["protogen.go"],
-    importpath = "github.com/openconfig/lemming/dataplane/standalone/apigen/protogen",
+    importpath = "github.com/openconfig/lemming/dataplane/apigen/protogen",
     visibility = ["//visibility:public"],
     deps = [
-        "//dataplane/standalone/apigen/docparser",
-        "//dataplane/standalone/apigen/saiast",
+        "//dataplane/apigen/docparser",
+        "//dataplane/apigen/saiast",
         "//internal/lemmingutil",
         "@com_github_golang_glog//:glog",
         "@com_github_stoewer_go_strcase//:go-strcase",
@@ -19,8 +19,8 @@ go_test(
     srcs = ["protogen_test.go"],
     embed = [":protogen"],
     deps = [
-        "//dataplane/standalone/apigen/docparser",
-        "//dataplane/standalone/apigen/saiast",
+        "//dataplane/apigen/docparser",
+        "//dataplane/apigen/saiast",
         "@com_github_google_go_cmp//cmp",
         "@com_github_openconfig_gnmi//errdiff",
     ],

diff --git a/...ne/standalone/apigen/protogen/protogen.go → dataplane/apigen/protogen/protogen.go b/...ne/standalone/apigen/protogen/protogen.go → dataplane/apigen/protogen/protogen.go
@@ -22,8 +22,8 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/docparser"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/saiast"
+	"github.com/openconfig/lemming/dataplane/apigen/docparser"
+	"github.com/openconfig/lemming/dataplane/apigen/saiast"
 	"github.com/openconfig/lemming/internal/lemmingutil"
 
 	log "github.com/golang/glog"
@@ -339,9 +339,9 @@ syntax = "proto3";
 
 package lemming.dataplane.sai;
 
-import "dataplane/standalone/proto/common.proto";
+import "dataplane/proto/common.proto";
 
-option go_package = "github.com/openconfig/lemming/dataplane/standalone/proto;sai";
+option go_package = "github.com/openconfig/lemming/dataplane/proto;sai";
 
 {{ range .Enums }}
 enum {{ .Name }} {
@@ -376,7 +376,7 @@ package lemming.dataplane.sai;
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/openconfig/lemming/dataplane/standalone/proto;sai";
+option go_package = "github.com/openconfig/lemming/dataplane/proto;sai";
 
 extend google.protobuf.FieldOptions {
 	optional int32 attr_enum_value = 50000;

diff --git a/...andalone/apigen/protogen/protogen_test.go → dataplane/apigen/protogen/protogen_test.go b/...andalone/apigen/protogen/protogen_test.go → dataplane/apigen/protogen/protogen_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/openconfig/gnmi/errdiff"
 
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/docparser"
-	"github.com/openconfig/lemming/dataplane/standalone/apigen/saiast"
+	"github.com/openconfig/lemming/dataplane/apigen/docparser"
+	"github.com/openconfig/lemming/dataplane/apigen/saiast"
 )
 
 const (
@@ -33,7 +33,7 @@ package lemming.dataplane.sai;
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/openconfig/lemming/dataplane/standalone/proto;sai";
+option go_package = "github.com/openconfig/lemming/dataplane/proto;sai";
 
 extend google.protobuf.FieldOptions {
 	optional int32 attr_enum_value = 50000;
@@ -447,9 +447,9 @@ syntax = "proto3";
 
 package lemming.dataplane.sai;
 
-import "dataplane/standalone/proto/common.proto";
+import "dataplane/proto/common.proto";
 
-option go_package = "github.com/openconfig/lemming/dataplane/standalone/proto;sai";
+option go_package = "github.com/openconfig/lemming/dataplane/proto;sai";
 
 
 enum FooAttr {
@@ -562,9 +562,9 @@ syntax = "proto3";
 
 package lemming.dataplane.sai;
 
-import "dataplane/standalone/proto/common.proto";
+import "dataplane/proto/common.proto";
 
-option go_package = "github.com/openconfig/lemming/dataplane/standalone/proto;sai";
+option go_package = "github.com/openconfig/lemming/dataplane/proto;sai";
 
 
 enum FooAttr {

diff --git a/dataplane/standalone/apigen/saiast/BUILD → dataplane/apigen/saiast/BUILD b/dataplane/standalone/apigen/saiast/BUILD → dataplane/apigen/saiast/BUILD
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "saiast",
     srcs = ["saiast.go"],
-    importpath = "github.com/openconfig/lemming/dataplane/standalone/apigen/saiast",
+    importpath = "github.com/openconfig/lemming/dataplane/apigen/saiast",
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_stoewer_go_strcase//:go-strcase",

diff --git a/dataplane/standalone/apigen/saiast/saiast.go → dataplane/apigen/saiast/saiast.go b/dataplane/standalone/apigen/saiast/saiast.go → dataplane/apigen/saiast/saiast.go
diff --git a/dataplane/dplanerc/BUILD b/dataplane/dplanerc/BUILD
@@ -9,8 +9,8 @@ go_library(
     importpath = "github.com/openconfig/lemming/dataplane/dplanerc",
     visibility = ["//visibility:public"],
     deps = [
-        "//dataplane/internal/engine",
-        "//dataplane/standalone/proto:sai",
+        "//dataplane/proto:sai",
+        "//dataplane/saiserver",
         "//gnmi",
         "//proto/dataplane",
         "//proto/forwarding",

diff --git a/dataplane/dplanerc/interface.go b/dataplane/dplanerc/interface.go
@@ -41,7 +41,7 @@ import (
 
 	log "github.com/golang/glog"
 
-	saipb "github.com/openconfig/lemming/dataplane/standalone/proto"
+	saipb "github.com/openconfig/lemming/dataplane/proto"
 	fwdpb "github.com/openconfig/lemming/proto/forwarding"
 )
 

diff --git a/dataplane/dplanerc/routes.go b/dataplane/dplanerc/routes.go
@@ -31,8 +31,8 @@ import (
 
 	log "github.com/golang/glog"
 
-	"github.com/openconfig/lemming/dataplane/internal/engine"
-	saipb "github.com/openconfig/lemming/dataplane/standalone/proto"
+	saipb "github.com/openconfig/lemming/dataplane/proto"
+	"github.com/openconfig/lemming/dataplane/saiserver"
 	dpb "github.com/openconfig/lemming/proto/dataplane"
 	fwdpb "github.com/openconfig/lemming/proto/forwarding"
 )
@@ -180,7 +180,7 @@ func (ni *Reconciler) createNextHop(ctx context.Context, hop *dpb.NextHop) (uint
 		}
 		actReq := &fwdpb.TableEntryAddRequest{
 			ContextId: &fwdpb.ContextId{Id: ni.contextID},
-			TableId:   &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: engine.NHActionTable}},
+			TableId:   &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: saiserver.NHActionTable}},
 			EntryDesc: &fwdpb.EntryDesc{Entry: &fwdpb.EntryDesc_Exact{
 				Exact: &fwdpb.ExactEntryDesc{
 					Fields: []*fwdpb.PacketFieldBytes{{

diff --git a/dataplane/internal/engine/BUILD b/dataplane/internal/engine/BUILD