Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index f471488..14a242b 100755
@@ -22,6 +22,17 @@ package(
licenses = ["notice"],
)

+proto_library(
+ name = "gnmi_internal_proto",
+ srcs = ["gnmi.proto"],
Expand All @@ -21,17 +21,17 @@ index f471488..14a242b 100755
name = "gnmi_proto",
srcs = ["gnmi.proto"],
@@ -35,12 +46,12 @@ proto_library(

cc_proto_library(
name = "gnmi_cc_proto",
- deps = [":gnmi_proto"],
+ deps = [":gnmi_internal_proto"],
)

cc_grpc_library(
name = "gnmi_cc_grpc_proto",
- srcs = [":gnmi_proto"],
+ srcs = [":gnmi_internal_proto"],
generate_mocks = True,
grpc_only = True,
deps = [":gnmi_cc_proto"],
deps = [":gnmi_cc_proto"],
8 changes: 4 additions & 4 deletions sdn_tests/pins_ondatra/bazel/patches/gnmi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ index ca5484e..238dde9 100644
#
# Supporting infrastructure for implementing and testing PINS.
+load("@bazel_gazelle//:def.bzl", "gazelle")

package(
default_visibility = ["//visibility:public"],
@@ -20,3 +21,6 @@ package(
)

exports_files(["LICENSE"])
+
+# gazelle:prefix github.com/openconfig/gnmi
Expand Down Expand Up @@ -74,12 +74,12 @@ index f471488..f6bd3bd 100644
+++ b/proto/gnmi/BUILD.bazel
@@ -16,6 +16,9 @@
#

load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")

package(
default_visibility = ["//visibility:public"],
@@ -45,3 +48,13 @@ cc_grpc_library(
Expand Down
4 changes: 2 additions & 2 deletions sdn_tests/pins_ondatra/bazel/patches/gnoi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index 039f3b5..7c9940b 100644
@@ -34,7 +34,7 @@ proto_library(
],
)

-go_proto_library(
+go_grpc_library(
name = "healthz_go_proto",
Expand All @@ -19,7 +19,7 @@ index 921d7c1..995dd1e 100644
@@ -32,6 +32,13 @@ proto_library(
deps = ["@com_google_protobuf//:descriptor_proto"],
)

+proto_library(
+ name = "gnoi_types_proto",
+ srcs = ["types.proto"],
Expand Down
6 changes: 3 additions & 3 deletions sdn_tests/pins_ondatra/bazel/patches/gnsi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ index ecb3f3f..c6216b8 100644
+ rpc Install(stream InstallAuthzRequest)
+ returns (stream InstallAuthzResponse);
}

// Request messages to rotate existing gRPC-level Authorization Policy on
@@ -152,6 +155,16 @@ message RotateAuthzRequest {
bool force_overwrite = 3;
}

+// Request messages to install a new Authz Policy on
+// the target.
+message InstallAuthzRequest {
Expand All @@ -32,7 +32,7 @@ index ecb3f3f..c6216b8 100644
@@ -160,6 +173,14 @@ message RotateAuthzResponse {
}
}

+// Response messages from the target.
+message InstallAuthzResponse {
+ // Response messages.
Expand Down
4 changes: 2 additions & 2 deletions sdn_tests/pins_ondatra/bazel/patches/gribi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ index 7ef4d9d..18f7324 100644
- deps = ["//github.com/openconfig/ygot/proto/yext:yext_proto"],
+ deps = ["@com_github_openconfig_ygot//proto/yext:yext_proto"],
)

go_proto_library(
@@ -14,7 +14,7 @@ go_proto_library(
importpath = "github.com/openconfig/gribi/v1/proto/gribi_aft/enums",
Expand All @@ -44,5 +44,5 @@ index 7ef4d9d..18f7324 100644
- deps = ["//github.com/openconfig/ygot/proto/yext:yext_proto"],
+ deps = ["@com_github_openconfig_ygot//proto/yext:go_default_library"],
)

go_library(
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ index 4d8afa3..b090036 100755
+++ b/bazel/grpc_extra_deps.bzl
@@ -53,7 +53,6 @@ def grpc_extra_deps(ignore_version_differences = False):
api_dependencies()

go_rules_dependencies()
- go_register_toolchains(version = "1.18")
gazelle_dependencies()

# Pull-in the go 3rd party dependencies for protoc_gen_validate, which is
9 changes: 5 additions & 4 deletions sdn_tests/pins_ondatra/bazel/patches/ondatra.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index 4d431d1..0ff43a4 100644
@@ -33,7 +33,7 @@ import (
credzpb "github.com/openconfig/gnsi/credentialz"
pathzpb "github.com/openconfig/gnsi/pathz"

- grpb "github.com/openconfig/gribi/v1/proto/service"
+ grpb "github.com/openconfig/gribi/proto/service"
opb "github.com/openconfig/ondatra/proto"
Expand All @@ -30,22 +30,23 @@ index bef545c..98df921 100644
+++ b/internal/rawapis/rawapis.go
@@ -34,7 +34,7 @@ import (
"google.golang.org/grpc"

gpb "github.com/openconfig/gnmi/proto/gnmi"
- grpb "github.com/openconfig/gribi/v1/proto/service"
+ grpb "github.com/openconfig/gribi/proto/service"
p4pb "github.com/p4lang/p4runtime/go/p4/v1"
)

diff --git a/raw/raw.go b/raw/raw.go
index 780e978..1821141 100644
--- a/raw/raw.go
+++ b/raw/raw.go
@@ -89,7 +89,7 @@ import (
"github.com/openconfig/ondatra/internal/rawapis"

gpb "github.com/openconfig/gnmi/proto/gnmi"
- grpb "github.com/openconfig/gribi/v1/proto/service"
+ grpb "github.com/openconfig/gribi/proto/service"
p4pb "github.com/p4lang/p4runtime/go/p4/v1"
)

5 changes: 3 additions & 2 deletions sdn_tests/pins_ondatra/bazel/patches/p4lang.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ index badddd9..079f258 100644
+++ b/proto/p4/config/v1/p4info.proto
@@ -15,7 +15,7 @@
syntax = "proto3";

import "google/protobuf/any.proto";
-import "p4/config/v1/p4types.proto";
+import "proto/p4/config/v1/p4types.proto";

// This package and its contents are a work-in-progress.

diff --git a/go/p4/v1/BUILD.bazel b/go/p4/v1/BUILD.bazel
Expand All @@ -22,3 +22,4 @@ index 6445fff..17a350c 100644
+ "@com_github_p4lang_p4runtime//go/p4/config/v1:go_default_library"
],
)

3 changes: 2 additions & 1 deletion sdn_tests/pins_ondatra/bazel/patches/snappi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index d72ce05..91b14e9 100644
+ "@org_golang_google_protobuf//types/known/emptypb",
+ ],
)

alias(

diff --git a/gosnappi/otg/BUILD.bazel b/gosnappi/otg/BUILD.bazel
Expand Down Expand Up @@ -51,3 +51,4 @@ index c0c81d6..5c4fc59 100644
+ importpath = "github.com/open-traffic-generator/snappi/gosnappi/otg",
visibility = ["//visibility:public"],
)

2 changes: 1 addition & 1 deletion sdn_tests/pins_ondatra/bazel/patches/ygnmi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ index a152057..3a2ee21 100644
+ "@com_github_openconfig_gnmi//proto/gnmi:gnmi_go_proto",
"@com_github_openconfig_gocloser//:go_default_library",
"@com_github_openconfig_goyang//pkg/yang:go_default_library",
"@com_github_openconfig_ygot//util:go_default_library",
"@com_github_openconfig_ygot//util:go_default_library",
4 changes: 2 additions & 2 deletions sdn_tests/pins_ondatra/bazel/patches/ygot.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ index 4ebd593..cd1f209 100644
+++ b/proto/yext/BUILD.bazel
@@ -1,5 +1,13 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")

+proto_library(
+ name = "yext_proto",
+ srcs = ["yext.proto"],
Expand All @@ -27,7 +27,7 @@ index 4537c63..51fb410 100644
+++ b/proto/ywrapper/BUILD.bazel
@@ -1,5 +1,12 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")

+proto_library(
+ name = "ywrapper_proto",
+ srcs = ["ywrapper.proto"],
Expand Down