diff --git a/codegen/Dockerfile b/codegen/Dockerfile index 24bd2be3..46e940d2 100644 --- a/codegen/Dockerfile +++ b/codegen/Dockerfile @@ -8,16 +8,23 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends software-properties-common git curl -ARG GO_VERSION=1.17.6 +ARG GO_VERSION=1.20.5 -RUN curl -o go.tar.gz https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go.tar.gz && \ - rm go.tar.gz +RUN set -eux; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "${dpkgArch##*-}" in \ + amd64) arch='amd64' ;; \ + arm64) arch='arm64' ;; \ + *) arch=''; echo >&2; echo >&2 "unsupported architecture '$dpkgArch'"; echo >&2 ; exit 1 ;; \ + esac; \ + curl -L -o go.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-${arch}.tar.gz; \ + tar -C /usr/local -xzf go.tar.gz; \ + rm -f go.tar.gz ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" -RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 -RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1 +RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31 +RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 COPY . /p4runtime/ WORKDIR /p4runtime/ diff --git a/codegen/update.sh b/codegen/update.sh index 2bbfe440..aa8b1772 100755 --- a/codegen/update.sh +++ b/codegen/update.sh @@ -31,7 +31,7 @@ docker run --rm -u "$(id -u):$(id -g)" \ -e "GOPATH=/tmp/gopath" \ -v "$(pwd):/p4runtime" \ -w /p4runtime \ - golang:1.17 bash -c "go mod tidy" + golang:1.20 bash -c "go mod tidy" rm -rf "$tmpdir" diff --git a/go.mod b/go.mod index 33692258..95d27459 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,16 @@ module github.com/p4lang/p4runtime -go 1.14 +go 1.20 require ( - github.com/golang/protobuf v1.4.3 // indirect - github.com/google/go-cmp v0.5.1 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 - google.golang.org/grpc v1.28.1 - google.golang.org/protobuf v1.25.0 + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 + google.golang.org/grpc v1.56.1 + google.golang.org/protobuf v1.31.0 +) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect ) diff --git a/go.sum b/go.sum index 7b4aa843..cbe5ad09 100644 --- a/go.sum +++ b/go.sum @@ -1,81 +1,20 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k= -google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/go/p4/config/v1/p4info.pb.go b/go/p4/config/v1/p4info.pb.go index b488f258..e8aedad1 100644 --- a/go/p4/config/v1/p4info.pb.go +++ b/go/p4/config/v1/p4info.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.31.0 // protoc v3.18.1 // source: p4/config/v1/p4info.proto @@ -1025,6 +1025,7 @@ type MatchField struct { AnnotationLocations []*SourceLocation `protobuf:"bytes,10,rep,name=annotation_locations,json=annotationLocations,proto3" json:"annotation_locations,omitempty"` Bitwidth int32 `protobuf:"varint,4,opt,name=bitwidth,proto3" json:"bitwidth,omitempty"` // Types that are assignable to Match: + // // *MatchField_MatchType_ // *MatchField_OtherMatchType Match isMatchField_Match `protobuf_oneof:"match"` @@ -1454,6 +1455,7 @@ type ActionProfile struct { // specifies the semantics of `size` and `max_group_size` above // // Types that are assignable to SelectorSizeSemantics: + // // *ActionProfile_SumOfWeights_ // *ActionProfile_SumOfMembers_ SelectorSizeSemantics isActionProfile_SelectorSizeSemantics `protobuf_oneof:"selector_size_semantics"` diff --git a/go/p4/config/v1/p4types.pb.go b/go/p4/config/v1/p4types.pb.go index a128d9f5..fff41698 100644 --- a/go/p4/config/v1/p4types.pb.go +++ b/go/p4/config/v1/p4types.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.31.0 // protoc v3.18.1 // source: p4/config/v1/p4types.proto @@ -143,6 +143,7 @@ type P4DataTypeSpec struct { unknownFields protoimpl.UnknownFields // Types that are assignable to TypeSpec: + // // *P4DataTypeSpec_Bitstring // *P4DataTypeSpec_Bool // *P4DataTypeSpec_Tuple @@ -488,6 +489,7 @@ type P4BitstringLikeTypeSpec struct { unknownFields protoimpl.UnknownFields // Types that are assignable to TypeSpec: + // // *P4BitstringLikeTypeSpec_Bit // *P4BitstringLikeTypeSpec_Int // *P4BitstringLikeTypeSpec_Varbit @@ -1231,6 +1233,7 @@ type Expression struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Value: + // // *Expression_StringValue // *Expression_Int64Value // *Expression_BoolValue @@ -1373,6 +1376,7 @@ type StructuredAnnotation struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Types that are assignable to Body: + // // *StructuredAnnotation_ExpressionList // *StructuredAnnotation_KvPairList Body isStructuredAnnotation_Body `protobuf_oneof:"body"` @@ -1751,6 +1755,7 @@ type P4NewTypeTranslation struct { // `sdn_bitwidth`, or as a string. // // Types that are assignable to SdnType: + // // *P4NewTypeTranslation_SdnBitwidth // *P4NewTypeTranslation_SdnString_ SdnType isP4NewTypeTranslation_SdnType `protobuf_oneof:"sdn_type"` @@ -1839,6 +1844,7 @@ type P4NewTypeSpec struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Representation: + // // *P4NewTypeSpec_OriginalType // *P4NewTypeSpec_TranslatedType Representation isP4NewTypeSpec_Representation `protobuf_oneof:"representation"` diff --git a/go/p4/v1/p4data.pb.go b/go/p4/v1/p4data.pb.go index 08f11c60..f287fb09 100644 --- a/go/p4/v1/p4data.pb.go +++ b/go/p4/v1/p4data.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.31.0 // protoc v3.18.1 // source: p4/v1/p4data.proto @@ -40,6 +40,7 @@ type P4Data struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Data: + // // *P4Data_Bitstring // *P4Data_Varbit // *P4Data_Bool diff --git a/go/p4/v1/p4runtime.pb.go b/go/p4/v1/p4runtime.pb.go index 53cb539e..9dfadf7e 100644 --- a/go/p4/v1/p4runtime.pb.go +++ b/go/p4/v1/p4runtime.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.31.0 // protoc v3.18.1 // source: p4/v1/p4runtime.proto @@ -39,7 +39,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // Reserved controller-specified SDN port numbers for reference. type SdnPort int32 @@ -363,14 +363,14 @@ func (GetForwardingPipelineConfigRequest_ResponseType) EnumDescriptor() ([]byte, return file_p4_v1_p4runtime_proto_rawDescGZIP(), []int{49, 0} } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type WriteRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields DeviceId uint64 `protobuf:"varint,1,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"` - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. RoleId uint64 `protobuf:"varint,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"` Role string `protobuf:"bytes,6,opt,name=role,proto3" json:"role,omitempty"` ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` @@ -420,7 +420,7 @@ func (x *WriteRequest) GetDeviceId() uint64 { return 0 } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *WriteRequest) GetRoleId() uint64 { if x != nil { return x.RoleId @@ -666,6 +666,7 @@ type Entity struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Entity: + // // *Entity_ExternEntry // *Entity_TableEntry // *Entity_ActionProfileMember @@ -965,7 +966,7 @@ type TableEntry struct { // a Read RPC. This is deprecated in favor of the more flexible metadata // field. // - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. ControllerMetadata uint64 `protobuf:"varint,5,opt,name=controller_metadata,json=controllerMetadata,proto3" json:"controller_metadata,omitempty"` // meter_config, counter_data and meter_counter_data are convenience fields // that enable the controller to configure the direct resources associated @@ -983,6 +984,7 @@ type TableEntry struct { // meter (if any) to its default configuration, while leaving counter_data // or meter_counter_data unset means that the counter (if any) will not be // updated. + // // Table read: // - If the table does not contain a direct resource, then the corresponding // field will not be set in the read table entry. @@ -1069,7 +1071,7 @@ func (x *TableEntry) GetPriority() int32 { return 0 } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *TableEntry) GetControllerMetadata() uint64 { if x != nil { return x.ControllerMetadata @@ -1134,6 +1136,7 @@ type FieldMatch struct { FieldId uint32 `protobuf:"varint,1,opt,name=field_id,json=fieldId,proto3" json:"field_id,omitempty"` // Types that are assignable to FieldMatchType: + // // *FieldMatch_Exact_ // *FieldMatch_Ternary_ // *FieldMatch_Lpm @@ -1280,6 +1283,7 @@ type TableAction struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Type: + // // *TableAction_Action // *TableAction_ActionProfileMemberId // *TableAction_ActionProfileGroupId @@ -1492,6 +1496,7 @@ type ActionProfileAction struct { Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` Weight int32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` // Types that are assignable to WatchKind: + // // *ActionProfileAction_Watch // *ActionProfileAction_WatchPort WatchKind isActionProfileAction_WatchKind `protobuf_oneof:"watch_kind"` @@ -1550,7 +1555,7 @@ func (m *ActionProfileAction) GetWatchKind() isActionProfileAction_WatchKind { return nil } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *ActionProfileAction) GetWatch() int32 { if x, ok := x.GetWatchKind().(*ActionProfileAction_Watch); ok { return x.Watch @@ -1572,7 +1577,7 @@ type isActionProfileAction_WatchKind interface { type ActionProfileAction_Watch struct { // Using int32 as ports is deprecated, use watch_port instead. // - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. Watch int32 `protobuf:"varint,3,opt,name=watch,proto3,oneof"` } @@ -1584,7 +1589,7 @@ func (*ActionProfileAction_Watch) isActionProfileAction_WatchKind() {} func (*ActionProfileAction_WatchPort) isActionProfileAction_WatchKind() {} -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type ActionProfileMember struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1648,7 +1653,7 @@ func (x *ActionProfileMember) GetAction() *Action { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type ActionProfileGroup struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1780,7 +1785,7 @@ func (x *Index) GetIndex() int64 { return 0 } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // For WriteRequest, Update.Type must be MODIFY. // For ReadRequest, the scope is defined as follows: // - All meter cells for all meters if meter_id = 0 (default). @@ -1856,14 +1861,14 @@ func (x *MeterEntry) GetCounterData() *MeterCounterData { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // For WriteRequest, Update.Type must be MODIFY. INSERT and DELETE on direct // meters is not allowed and will return an error. The insertion/deletion // should happen as part of INSERT/DELETE on the associated table-entry. // For ReadRequest, the scope is defined as follows: -// - All meter cells for all tables if table_entry.table_id = 0. -// - All meter cells of a table if table_entry.table_id is present and -// table_entry.match is empty. +// - All meter cells for all tables if table_entry.table_id = 0. +// - All meter cells of a table if table_entry.table_id is present and +// table_entry.match is empty. type DirectMeterEntry struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2010,7 +2015,7 @@ func (x *MeterConfig) GetPburst() int64 { return 0 } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // For WriteRequest, Update.Type must be MODIFY. // For ReadRequest, the scope is defined as follows: // - All counter cells for all counters if counter_id = 0 (default). @@ -2078,14 +2083,14 @@ func (x *CounterEntry) GetData() *CounterData { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // For WriteRequest, Update.Type must be MODIFY. INSERT and DELETE on direct // counters is not allowed and will return an error. The insertion/deletion // should happen as part of INSERT/DELETE on the associated table-entry. // For ReadRequest, the scope is defined as follows: -// - All counter cells for all tables if table_entry.table_id = 0. -// - All counter cells of a table if table_entry.table_id is present and -// table_entry.match is empty. +// - All counter cells for all tables if table_entry.table_id = 0. +// - All counter cells of a table if table_entry.table_id is present and +// table_entry.match is empty. type DirectCounterEntry struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2261,7 +2266,7 @@ func (x *MeterCounterData) GetRed() *CounterData { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // Only one instance of a Packet Replication Engine (PRE) is expected in the // P4 pipeline. Hence, no instance id is needed to access the PRE. type PacketReplicationEngineEntry struct { @@ -2270,6 +2275,7 @@ type PacketReplicationEngineEntry struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Type: + // // *PacketReplicationEngineEntry_MulticastGroupEntry // *PacketReplicationEngineEntry_CloneSessionEntry Type isPacketReplicationEngineEntry_Type `protobuf_oneof:"type"` @@ -2351,6 +2357,7 @@ type Replica struct { unknownFields protoimpl.UnknownFields // Types that are assignable to PortKind: + // // *Replica_EgressPort // *Replica_Port PortKind isReplica_PortKind `protobuf_oneof:"port_kind"` @@ -2396,7 +2403,7 @@ func (m *Replica) GetPortKind() isReplica_PortKind { return nil } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *Replica) GetEgressPort() uint32 { if x, ok := x.GetPortKind().(*Replica_EgressPort); ok { return x.EgressPort @@ -2425,7 +2432,7 @@ type isReplica_PortKind interface { type Replica_EgressPort struct { // Using uint32 as ports is deprecated, use port field instead. // - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. EgressPort uint32 `protobuf:"varint,1,opt,name=egress_port,json=egressPort,proto3,oneof"` } @@ -2631,7 +2638,7 @@ func (x *ValueSetMember) GetMatch() []*FieldMatch { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // For writing and reading matches in a parser value set. A state transition // on an empty value set will never be taken. The number of matches must be at // most the size of the value set as specified by the size argument of the @@ -2701,7 +2708,7 @@ func (x *ValueSetEntry) GetMembers() []*ValueSetMember { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type RegisterEntry struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2765,7 +2772,7 @@ func (x *RegisterEntry) GetData() *P4Data { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // Used to configure the digest extern only, not to stream digests or acks type DigestEntry struct { state protoimpl.MessageState @@ -2822,13 +2829,14 @@ func (x *DigestEntry) GetConfig() *DigestEntry_Config { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type StreamMessageRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields // Types that are assignable to Update: + // // *StreamMessageRequest_Arbitration // *StreamMessageRequest_Packet // *StreamMessageRequest_DigestAck @@ -3055,6 +3063,7 @@ type StreamMessageResponse struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Update: + // // *StreamMessageResponse_Arbitration // *StreamMessageResponse_Packet // *StreamMessageResponse_Digest @@ -3470,7 +3479,7 @@ type Role struct { // Uniquely identifies this role. // - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` // Describes the role configuration, i.e. what operations, P4 entities, @@ -3513,7 +3522,7 @@ func (*Role) Descriptor() ([]byte, []int) { return file_p4_v1_p4runtime_proto_rawDescGZIP(), []int{39} } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *Role) GetId() uint64 { if x != nil { return x.Id @@ -3620,6 +3629,7 @@ type StreamError struct { // default value. // // Types that are assignable to Details: + // // *StreamError_PacketOut // *StreamError_DigestListAck // *StreamError_Other @@ -3937,14 +3947,14 @@ func (x *Uint128) GetLow() uint64 { return 0 } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type SetForwardingPipelineConfigRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields DeviceId uint64 `protobuf:"varint,1,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"` - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. RoleId uint64 `protobuf:"varint,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"` Role string `protobuf:"bytes,6,opt,name=role,proto3" json:"role,omitempty"` ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` @@ -3991,7 +4001,7 @@ func (x *SetForwardingPipelineConfigRequest) GetDeviceId() uint64 { return 0 } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *SetForwardingPipelineConfigRequest) GetRoleId() uint64 { if x != nil { return x.RoleId @@ -4320,7 +4330,7 @@ func (x *Error) GetDetails() *anypb.Any { return nil } -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ type CapabilitiesRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -4785,6 +4795,7 @@ type ActionProfileGroup_Member struct { MemberId uint32 `protobuf:"varint,1,opt,name=member_id,json=memberId,proto3" json:"member_id,omitempty"` Weight int32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` // Types that are assignable to WatchKind: + // // *ActionProfileGroup_Member_Watch // *ActionProfileGroup_Member_WatchPort WatchKind isActionProfileGroup_Member_WatchKind `protobuf_oneof:"watch_kind"` @@ -4843,7 +4854,7 @@ func (m *ActionProfileGroup_Member) GetWatchKind() isActionProfileGroup_Member_W return nil } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. func (x *ActionProfileGroup_Member) GetWatch() int32 { if x, ok := x.GetWatchKind().(*ActionProfileGroup_Member_Watch); ok { return x.Watch @@ -4865,7 +4876,7 @@ type isActionProfileGroup_Member_WatchKind interface { type ActionProfileGroup_Member_Watch struct { // Using int32 as ports is deprecated, use watch_port instead. // - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in p4/v1/p4runtime.proto. Watch int32 `protobuf:"varint,3,opt,name=watch,proto3,oneof"` } diff --git a/go/p4/v1/p4runtime_grpc.pb.go b/go/p4/v1/p4runtime_grpc.pb.go index 4985b2d7..dfecbe32 100644 --- a/go/p4/v1/p4runtime_grpc.pb.go +++ b/go/p4/v1/p4runtime_grpc.pb.go @@ -1,4 +1,24 @@ +// Copyright (c) 2016, Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.18.1 +// source: p4/v1/p4runtime.proto + +// This package and its contents are a work-in-progress. package v1 @@ -14,6 +34,15 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + P4Runtime_Write_FullMethodName = "/p4.v1.P4Runtime/Write" + P4Runtime_Read_FullMethodName = "/p4.v1.P4Runtime/Read" + P4Runtime_SetForwardingPipelineConfig_FullMethodName = "/p4.v1.P4Runtime/SetForwardingPipelineConfig" + P4Runtime_GetForwardingPipelineConfig_FullMethodName = "/p4.v1.P4Runtime/GetForwardingPipelineConfig" + P4Runtime_StreamChannel_FullMethodName = "/p4.v1.P4Runtime/StreamChannel" + P4Runtime_Capabilities_FullMethodName = "/p4.v1.P4Runtime/Capabilities" +) + // P4RuntimeClient is the client API for P4Runtime service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -29,13 +58,13 @@ type P4RuntimeClient interface { // Represents the bidirectional stream between the controller and the // switch (initiated by the controller), and is managed for the following // purposes: - // - connection initiation through client arbitration - // - indicating switch session liveness: the session is live when switch - // sends a positive client arbitration update to the controller, and is - // considered dead when either the stream breaks or the switch sends a - // negative update for client arbitration - // - the controller sending/receiving packets to/from the switch - // - streaming of notifications from the switch + // - connection initiation through client arbitration + // - indicating switch session liveness: the session is live when switch + // sends a positive client arbitration update to the controller, and is + // considered dead when either the stream breaks or the switch sends a + // negative update for client arbitration + // - the controller sending/receiving packets to/from the switch + // - streaming of notifications from the switch StreamChannel(ctx context.Context, opts ...grpc.CallOption) (P4Runtime_StreamChannelClient, error) Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesResponse, error) } @@ -50,7 +79,7 @@ func NewP4RuntimeClient(cc grpc.ClientConnInterface) P4RuntimeClient { func (c *p4RuntimeClient) Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error) { out := new(WriteResponse) - err := c.cc.Invoke(ctx, "/p4.v1.P4Runtime/Write", in, out, opts...) + err := c.cc.Invoke(ctx, P4Runtime_Write_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -58,7 +87,7 @@ func (c *p4RuntimeClient) Write(ctx context.Context, in *WriteRequest, opts ...g } func (c *p4RuntimeClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (P4Runtime_ReadClient, error) { - stream, err := c.cc.NewStream(ctx, &P4Runtime_ServiceDesc.Streams[0], "/p4.v1.P4Runtime/Read", opts...) + stream, err := c.cc.NewStream(ctx, &P4Runtime_ServiceDesc.Streams[0], P4Runtime_Read_FullMethodName, opts...) if err != nil { return nil, err } @@ -91,7 +120,7 @@ func (x *p4RuntimeReadClient) Recv() (*ReadResponse, error) { func (c *p4RuntimeClient) SetForwardingPipelineConfig(ctx context.Context, in *SetForwardingPipelineConfigRequest, opts ...grpc.CallOption) (*SetForwardingPipelineConfigResponse, error) { out := new(SetForwardingPipelineConfigResponse) - err := c.cc.Invoke(ctx, "/p4.v1.P4Runtime/SetForwardingPipelineConfig", in, out, opts...) + err := c.cc.Invoke(ctx, P4Runtime_SetForwardingPipelineConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -100,7 +129,7 @@ func (c *p4RuntimeClient) SetForwardingPipelineConfig(ctx context.Context, in *S func (c *p4RuntimeClient) GetForwardingPipelineConfig(ctx context.Context, in *GetForwardingPipelineConfigRequest, opts ...grpc.CallOption) (*GetForwardingPipelineConfigResponse, error) { out := new(GetForwardingPipelineConfigResponse) - err := c.cc.Invoke(ctx, "/p4.v1.P4Runtime/GetForwardingPipelineConfig", in, out, opts...) + err := c.cc.Invoke(ctx, P4Runtime_GetForwardingPipelineConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -108,7 +137,7 @@ func (c *p4RuntimeClient) GetForwardingPipelineConfig(ctx context.Context, in *G } func (c *p4RuntimeClient) StreamChannel(ctx context.Context, opts ...grpc.CallOption) (P4Runtime_StreamChannelClient, error) { - stream, err := c.cc.NewStream(ctx, &P4Runtime_ServiceDesc.Streams[1], "/p4.v1.P4Runtime/StreamChannel", opts...) + stream, err := c.cc.NewStream(ctx, &P4Runtime_ServiceDesc.Streams[1], P4Runtime_StreamChannel_FullMethodName, opts...) if err != nil { return nil, err } @@ -140,7 +169,7 @@ func (x *p4RuntimeStreamChannelClient) Recv() (*StreamMessageResponse, error) { func (c *p4RuntimeClient) Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesResponse, error) { out := new(CapabilitiesResponse) - err := c.cc.Invoke(ctx, "/p4.v1.P4Runtime/Capabilities", in, out, opts...) + err := c.cc.Invoke(ctx, P4Runtime_Capabilities_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -162,13 +191,13 @@ type P4RuntimeServer interface { // Represents the bidirectional stream between the controller and the // switch (initiated by the controller), and is managed for the following // purposes: - // - connection initiation through client arbitration - // - indicating switch session liveness: the session is live when switch - // sends a positive client arbitration update to the controller, and is - // considered dead when either the stream breaks or the switch sends a - // negative update for client arbitration - // - the controller sending/receiving packets to/from the switch - // - streaming of notifications from the switch + // - connection initiation through client arbitration + // - indicating switch session liveness: the session is live when switch + // sends a positive client arbitration update to the controller, and is + // considered dead when either the stream breaks or the switch sends a + // negative update for client arbitration + // - the controller sending/receiving packets to/from the switch + // - streaming of notifications from the switch StreamChannel(P4Runtime_StreamChannelServer) error Capabilities(context.Context, *CapabilitiesRequest) (*CapabilitiesResponse, error) mustEmbedUnimplementedP4RuntimeServer() @@ -219,7 +248,7 @@ func _P4Runtime_Write_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/p4.v1.P4Runtime/Write", + FullMethod: P4Runtime_Write_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(P4RuntimeServer).Write(ctx, req.(*WriteRequest)) @@ -258,7 +287,7 @@ func _P4Runtime_SetForwardingPipelineConfig_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/p4.v1.P4Runtime/SetForwardingPipelineConfig", + FullMethod: P4Runtime_SetForwardingPipelineConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(P4RuntimeServer).SetForwardingPipelineConfig(ctx, req.(*SetForwardingPipelineConfigRequest)) @@ -276,7 +305,7 @@ func _P4Runtime_GetForwardingPipelineConfig_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/p4.v1.P4Runtime/GetForwardingPipelineConfig", + FullMethod: P4Runtime_GetForwardingPipelineConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(P4RuntimeServer).GetForwardingPipelineConfig(ctx, req.(*GetForwardingPipelineConfigRequest)) @@ -320,7 +349,7 @@ func _P4Runtime_Capabilities_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/p4.v1.P4Runtime/Capabilities", + FullMethod: P4Runtime_Capabilities_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(P4RuntimeServer).Capabilities(ctx, req.(*CapabilitiesRequest))