From a19e66ddc76888f573328dca7663dca0bedd1448 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Fri, 17 Jan 2025 00:15:05 +0000 Subject: [PATCH 1/5] Updated enum in openconfig-aft-types.yang; update the go.mod and ran go mod tidy --- go.mod | 4 ++-- go.sum | 24 ++++++++++++++++++++---- v1/yang/aft/openconfig-aft-types.yang | 8 ++++++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 0c5d809..0e600bc 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.22 require ( github.com/openconfig/ygot v0.29.20 - google.golang.org/grpc v1.68.1 - google.golang.org/protobuf v1.35.2 + google.golang.org/grpc v1.69.4 + google.golang.org/protobuf v1.36.3 ) require ( diff --git a/go.sum b/go.sum index d185aeb..9522be4 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,25 @@ +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/openconfig/ygot v0.29.20 h1:XHLpwCN91QuKc2LAvnEqtCmH8OuxgLlErDhrdl2mJw8= github.com/openconfig/ygot v0.29.20/go.mod h1:K8HbrPm/v8/emtGQ9+RsJXx6UPKC5JzS/FqK7pN+tMo= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= +go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= +go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= @@ -12,7 +28,7 @@ golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= -google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= -google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= +google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= +google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= diff --git a/v1/yang/aft/openconfig-aft-types.yang b/v1/yang/aft/openconfig-aft-types.yang index 56d920b..8d196fd 100644 --- a/v1/yang/aft/openconfig-aft-types.yang +++ b/v1/yang/aft/openconfig-aft-types.yang @@ -95,9 +95,13 @@ module openconfig-aft-types { description "The encapsulation header is a VXLAN packet header"; } - enum UDP { + enum UDPV4 { description - "The encapsulation header is UDP packet header."; + "The encapsulation header is UDPV4 packet header."; + } + enum UDPV6 { + description + "The encapsulation header is UDPV6 packet header."; } } description From 1d3e94b80c3f92e7e3ac601d52373562a5cd148c Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Thu, 23 Jan 2025 21:53:05 +0000 Subject: [PATCH 2/5] keep pace with openconfig/public --- v1/yang/aft/openconfig-aft-types.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/v1/yang/aft/openconfig-aft-types.yang b/v1/yang/aft/openconfig-aft-types.yang index 8d196fd..c956608 100644 --- a/v1/yang/aft/openconfig-aft-types.yang +++ b/v1/yang/aft/openconfig-aft-types.yang @@ -95,6 +95,10 @@ module openconfig-aft-types { description "The encapsulation header is a VXLAN packet header"; } + enum UDP { + description + "The encapsulation header is UDP packet header."; + } enum UDPV4 { description "The encapsulation header is UDPV4 packet header."; From 4a266bc951c64bd4b1bcf188673be79959b10da8 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Tue, 28 Jan 2025 08:52:40 +0000 Subject: [PATCH 3/5] Ran update_schema.sh and generate_proto.sh to generate the updates based on the yang model. --- v1/proto/gribi_aft/enums/enums.pb.go | 178 +++++++------ v1/proto/gribi_aft/enums/enums.proto | 2 + v1/proto/gribi_aft/gribi_aft.pb.go | 366 +++++++++++++-------------- v1/proto/service/gribi.pb.go | 299 ++++++++++++---------- v1/proto/service/gribi_grpc.pb.go | 2 +- 5 files changed, 434 insertions(+), 413 deletions(-) diff --git a/v1/proto/gribi_aft/enums/enums.pb.go b/v1/proto/gribi_aft/enums/enums.pb.go index c6bce40..41ddbdd 100644 --- a/v1/proto/gribi_aft/enums/enums.pb.go +++ b/v1/proto/gribi_aft/enums/enums.pb.go @@ -9,8 +9,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: v1/proto/gribi_aft/enums/enums.proto package enums @@ -41,6 +41,8 @@ const ( OpenconfigAftTypesEncapsulationHeaderType_OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_MPLS OpenconfigAftTypesEncapsulationHeaderType = 4 OpenconfigAftTypesEncapsulationHeaderType_OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_VXLAN OpenconfigAftTypesEncapsulationHeaderType = 5 OpenconfigAftTypesEncapsulationHeaderType_OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDP OpenconfigAftTypesEncapsulationHeaderType = 6 + OpenconfigAftTypesEncapsulationHeaderType_OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV4 OpenconfigAftTypesEncapsulationHeaderType = 7 + OpenconfigAftTypesEncapsulationHeaderType_OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV6 OpenconfigAftTypesEncapsulationHeaderType = 8 ) // Enum value maps for OpenconfigAftTypesEncapsulationHeaderType. @@ -53,6 +55,8 @@ var ( 4: "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_MPLS", 5: "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_VXLAN", 6: "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDP", + 7: "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV4", + 8: "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV6", } OpenconfigAftTypesEncapsulationHeaderType_value = map[string]int32{ "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UNSET": 0, @@ -62,6 +66,8 @@ var ( "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_MPLS": 4, "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_VXLAN": 5, "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDP": 6, + "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV4": 7, + "OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV6": 8, } ) @@ -237,7 +243,7 @@ var file_v1_proto_gribi_aft_enums_enums_proto_rawDesc = []byte{ 0x74, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x1a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x79, 0x67, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x79, 0x65, 0x78, 0x74, 0x2f, 0x79, - 0x65, 0x78, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2a, 0xcc, 0x03, 0x0a, 0x29, 0x4f, 0x70, + 0x65, 0x78, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2a, 0xca, 0x04, 0x0a, 0x29, 0x4f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x41, 0x66, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x45, 0x6e, 0x63, 0x61, 0x70, 0x73, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x2f, 0x4f, 0x50, 0x45, 0x4e, 0x43, @@ -266,90 +272,98 @@ var file_v1_proto_gribi_aft_enums_enums_proto_rawDesc = []byte{ 0x2d, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x41, 0x46, 0x54, 0x54, 0x59, 0x50, 0x45, 0x53, 0x45, 0x4e, 0x43, 0x41, 0x50, 0x53, 0x55, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x44, 0x50, 0x10, 0x06, - 0x1a, 0x06, 0x82, 0x41, 0x03, 0x55, 0x44, 0x50, 0x2a, 0x8e, 0x04, 0x0a, 0x20, 0x4f, 0x70, 0x65, - 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4d, 0x70, 0x6c, 0x73, 0x54, 0x79, 0x70, 0x65, 0x73, - 0x4d, 0x70, 0x6c, 0x73, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x0a, - 0x26, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, - 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, - 0x4d, 0x5f, 0x55, 0x4e, 0x53, 0x45, 0x54, 0x10, 0x00, 0x12, 0x4e, 0x0a, 0x33, 0x4f, 0x50, 0x45, - 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x49, 0x50, - 0x56, 0x34, 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, - 0x10, 0x01, 0x1a, 0x15, 0x82, 0x41, 0x12, 0x49, 0x50, 0x56, 0x34, 0x5f, 0x45, 0x58, 0x50, 0x4c, - 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x12, 0x42, 0x0a, 0x2d, 0x4f, 0x50, 0x45, - 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x52, 0x4f, - 0x55, 0x54, 0x45, 0x52, 0x5f, 0x41, 0x4c, 0x45, 0x52, 0x54, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x41, - 0x0c, 0x52, 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x41, 0x4c, 0x45, 0x52, 0x54, 0x12, 0x4e, 0x0a, - 0x33, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, - 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, - 0x4d, 0x5f, 0x49, 0x50, 0x56, 0x36, 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, - 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x03, 0x1a, 0x15, 0x82, 0x41, 0x12, 0x49, 0x50, 0x56, 0x36, 0x5f, - 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x12, 0x44, 0x0a, - 0x2e, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, - 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, - 0x4d, 0x5f, 0x49, 0x4d, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, - 0x04, 0x1a, 0x10, 0x82, 0x41, 0x0d, 0x49, 0x4d, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, - 0x55, 0x4c, 0x4c, 0x12, 0x58, 0x0a, 0x38, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, - 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, - 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x4f, 0x50, 0x59, 0x5f, - 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x43, 0x41, 0x54, 0x4f, 0x52, 0x10, - 0x08, 0x1a, 0x1a, 0x82, 0x41, 0x17, 0x45, 0x4e, 0x54, 0x52, 0x4f, 0x50, 0x59, 0x5f, 0x4c, 0x41, - 0x42, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x43, 0x41, 0x54, 0x4f, 0x52, 0x12, 0x3a, 0x0a, - 0x29, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, - 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, - 0x4d, 0x5f, 0x4e, 0x4f, 0x5f, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x09, 0x1a, 0x0b, 0x82, 0x41, - 0x08, 0x4e, 0x4f, 0x5f, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x2a, 0xe0, 0x05, 0x0a, 0x24, 0x4f, 0x70, - 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x73, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, - 0x4f, 0x4c, 0x12, 0x2e, 0x0a, 0x2a, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x45, 0x54, - 0x10, 0x00, 0x12, 0x3d, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x47, 0x52, - 0x45, 0x10, 0xd7, 0xf2, 0xbb, 0x0b, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x47, 0x52, - 0x45, 0x12, 0x3d, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, - 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, - 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x54, 0x43, 0x50, - 0x10, 0x8a, 0xb2, 0xbb, 0x12, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x54, 0x43, 0x50, - 0x12, 0x3f, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, + 0x1a, 0x06, 0x82, 0x41, 0x03, 0x55, 0x44, 0x50, 0x12, 0x3d, 0x0a, 0x2f, 0x4f, 0x50, 0x45, 0x4e, + 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x41, 0x46, 0x54, 0x54, 0x59, 0x50, 0x45, 0x53, 0x45, 0x4e, + 0x43, 0x41, 0x50, 0x53, 0x55, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x48, 0x45, 0x41, 0x44, 0x45, + 0x52, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x44, 0x50, 0x56, 0x34, 0x10, 0x07, 0x1a, 0x08, 0x82, + 0x41, 0x05, 0x55, 0x44, 0x50, 0x56, 0x34, 0x12, 0x3d, 0x0a, 0x2f, 0x4f, 0x50, 0x45, 0x4e, 0x43, + 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x41, 0x46, 0x54, 0x54, 0x59, 0x50, 0x45, 0x53, 0x45, 0x4e, 0x43, + 0x41, 0x50, 0x53, 0x55, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, + 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x44, 0x50, 0x56, 0x36, 0x10, 0x08, 0x1a, 0x08, 0x82, 0x41, + 0x05, 0x55, 0x44, 0x50, 0x56, 0x36, 0x2a, 0x8e, 0x04, 0x0a, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4d, 0x70, 0x6c, 0x73, 0x54, 0x79, 0x70, 0x65, 0x73, 0x4d, 0x70, + 0x6c, 0x73, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x0a, 0x26, 0x4f, + 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, + 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, + 0x55, 0x4e, 0x53, 0x45, 0x54, 0x10, 0x00, 0x12, 0x4e, 0x0a, 0x33, 0x4f, 0x50, 0x45, 0x4e, 0x43, + 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, + 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x49, 0x50, 0x56, 0x34, + 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x01, + 0x1a, 0x15, 0x82, 0x41, 0x12, 0x49, 0x50, 0x56, 0x34, 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, + 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x12, 0x42, 0x0a, 0x2d, 0x4f, 0x50, 0x45, 0x4e, 0x43, + 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, + 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x52, 0x4f, 0x55, 0x54, + 0x45, 0x52, 0x5f, 0x41, 0x4c, 0x45, 0x52, 0x54, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x41, 0x0c, 0x52, + 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x41, 0x4c, 0x45, 0x52, 0x54, 0x12, 0x4e, 0x0a, 0x33, 0x4f, + 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, + 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, + 0x49, 0x50, 0x56, 0x36, 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, + 0x4c, 0x4c, 0x10, 0x03, 0x1a, 0x15, 0x82, 0x41, 0x12, 0x49, 0x50, 0x56, 0x36, 0x5f, 0x45, 0x58, + 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x12, 0x44, 0x0a, 0x2e, 0x4f, + 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, + 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, + 0x49, 0x4d, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x04, 0x1a, + 0x10, 0x82, 0x41, 0x0d, 0x49, 0x4d, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x5f, 0x4e, 0x55, 0x4c, + 0x4c, 0x12, 0x58, 0x0a, 0x38, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, + 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, + 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x4f, 0x50, 0x59, 0x5f, 0x4c, 0x41, + 0x42, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x43, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x08, 0x1a, + 0x1a, 0x82, 0x41, 0x17, 0x45, 0x4e, 0x54, 0x52, 0x4f, 0x50, 0x59, 0x5f, 0x4c, 0x41, 0x42, 0x45, + 0x4c, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x43, 0x41, 0x54, 0x4f, 0x52, 0x12, 0x3a, 0x0a, 0x29, 0x4f, + 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x4d, 0x50, 0x4c, 0x53, 0x54, 0x59, 0x50, + 0x45, 0x53, 0x4d, 0x50, 0x4c, 0x53, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x45, 0x4e, 0x55, 0x4d, 0x5f, + 0x4e, 0x4f, 0x5f, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x09, 0x1a, 0x0b, 0x82, 0x41, 0x08, 0x4e, + 0x4f, 0x5f, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x2a, 0xe0, 0x05, 0x0a, 0x24, 0x4f, 0x70, 0x65, 0x6e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, + 0x68, 0x54, 0x79, 0x70, 0x65, 0x73, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, + 0x12, 0x2e, 0x0a, 0x2a, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, + 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, + 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x45, 0x54, 0x10, 0x00, + 0x12, 0x3d, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, + 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, + 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x47, 0x52, 0x45, 0x10, + 0xd7, 0xf2, 0xbb, 0x0b, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x47, 0x52, 0x45, 0x12, + 0x3d, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, + 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, + 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x8a, + 0xb2, 0xbb, 0x12, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x54, 0x43, 0x50, 0x12, 0x3f, + 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, + 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, + 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x4c, 0x32, 0x54, 0x50, 0x10, 0xb3, + 0x82, 0x87, 0x27, 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x4c, 0x32, 0x54, 0x50, 0x12, + 0x3f, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, + 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, + 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x41, 0x55, 0x54, 0x48, 0x10, + 0xc7, 0xa9, 0x9d, 0x61, 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x41, 0x55, 0x54, 0x48, + 0x12, 0x3e, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, - 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x4c, 0x32, 0x54, 0x50, - 0x10, 0xb3, 0x82, 0x87, 0x27, 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x4c, 0x32, 0x54, - 0x50, 0x12, 0x3f, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, - 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, - 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x41, 0x55, 0x54, - 0x48, 0x10, 0xc7, 0xa9, 0x9d, 0x61, 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x41, 0x55, - 0x54, 0x48, 0x12, 0x3e, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x50, 0x49, - 0x4d, 0x10, 0xe5, 0xdf, 0x90, 0x82, 0x01, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x50, - 0x49, 0x4d, 0x12, 0x42, 0x0a, 0x2d, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, - 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x49, 0x4e, - 0x5f, 0x49, 0x50, 0x10, 0xc4, 0x83, 0xd5, 0x93, 0x01, 0x1a, 0x0b, 0x82, 0x41, 0x08, 0x49, 0x50, - 0x5f, 0x49, 0x4e, 0x5f, 0x49, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, + 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x50, 0x49, 0x4d, 0x10, + 0xe5, 0xdf, 0x90, 0x82, 0x01, 0x1a, 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x50, 0x49, 0x4d, + 0x12, 0x42, 0x0a, 0x2d, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, + 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, + 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x49, 0x4e, 0x5f, 0x49, + 0x50, 0x10, 0xc4, 0x83, 0xd5, 0x93, 0x01, 0x1a, 0x0b, 0x82, 0x41, 0x08, 0x49, 0x50, 0x5f, 0x49, + 0x4e, 0x5f, 0x49, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, + 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, + 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, + 0x49, 0x47, 0x4d, 0x50, 0x10, 0xfa, 0xcb, 0xa2, 0xf4, 0x01, 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, + 0x50, 0x5f, 0x49, 0x47, 0x4d, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, - 0x50, 0x5f, 0x49, 0x47, 0x4d, 0x50, 0x10, 0xfa, 0xcb, 0xa2, 0xf4, 0x01, 0x1a, 0x0a, 0x82, 0x41, - 0x07, 0x49, 0x50, 0x5f, 0x49, 0x47, 0x4d, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, + 0x50, 0x5f, 0x49, 0x43, 0x4d, 0x50, 0x10, 0xd6, 0xc0, 0xc6, 0xf4, 0x01, 0x1a, 0x0a, 0x82, 0x41, + 0x07, 0x49, 0x50, 0x5f, 0x49, 0x43, 0x4d, 0x50, 0x12, 0x3e, 0x0a, 0x2b, 0x4f, 0x50, 0x45, 0x4e, + 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, + 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, + 0x5f, 0x49, 0x50, 0x5f, 0x55, 0x44, 0x50, 0x10, 0xfa, 0xc7, 0xb1, 0xfa, 0x01, 0x1a, 0x09, 0x82, + 0x41, 0x06, 0x49, 0x50, 0x5f, 0x55, 0x44, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, - 0x5f, 0x49, 0x50, 0x5f, 0x49, 0x43, 0x4d, 0x50, 0x10, 0xd6, 0xc0, 0xc6, 0xf4, 0x01, 0x1a, 0x0a, - 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x49, 0x43, 0x4d, 0x50, 0x12, 0x3e, 0x0a, 0x2b, 0x4f, 0x50, - 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, - 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, - 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x55, 0x44, 0x50, 0x10, 0xfa, 0xc7, 0xb1, 0xfa, 0x01, 0x1a, - 0x09, 0x82, 0x41, 0x06, 0x49, 0x50, 0x5f, 0x55, 0x44, 0x50, 0x12, 0x40, 0x0a, 0x2c, 0x4f, 0x50, - 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x4d, 0x41, - 0x54, 0x43, 0x48, 0x54, 0x59, 0x50, 0x45, 0x53, 0x49, 0x50, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, - 0x4f, 0x4c, 0x5f, 0x49, 0x50, 0x5f, 0x52, 0x53, 0x56, 0x50, 0x10, 0xea, 0xf6, 0xe0, 0xfc, 0x01, - 0x1a, 0x0a, 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x52, 0x53, 0x56, 0x50, 0x42, 0x36, 0x5a, 0x34, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x67, 0x72, 0x69, 0x62, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x72, 0x69, 0x62, 0x69, 0x5f, 0x61, 0x66, 0x74, 0x2f, 0x65, - 0x6e, 0x75, 0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x49, 0x50, 0x5f, 0x52, 0x53, 0x56, 0x50, 0x10, 0xea, 0xf6, 0xe0, 0xfc, 0x01, 0x1a, 0x0a, + 0x82, 0x41, 0x07, 0x49, 0x50, 0x5f, 0x52, 0x53, 0x56, 0x50, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x2f, 0x67, 0x72, 0x69, 0x62, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x67, 0x72, 0x69, 0x62, 0x69, 0x5f, 0x61, 0x66, 0x74, 0x2f, 0x65, 0x6e, 0x75, + 0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/v1/proto/gribi_aft/enums/enums.proto b/v1/proto/gribi_aft/enums/enums.proto index 0295795..536f593 100644 --- a/v1/proto/gribi_aft/enums/enums.proto +++ b/v1/proto/gribi_aft/enums/enums.proto @@ -23,6 +23,8 @@ enum OpenconfigAftTypesEncapsulationHeaderType { OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_MPLS = 4 [(yext.yang_name) = "MPLS"]; OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_VXLAN = 5 [(yext.yang_name) = "VXLAN"]; OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDP = 6 [(yext.yang_name) = "UDP"]; + OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV4 = 7 [(yext.yang_name) = "UDPV4"]; + OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_UDPV6 = 8 [(yext.yang_name) = "UDPV6"]; } // OpenconfigMplsTypesMplsLabelEnum represents an enumerated type generated for the YANG enumerated type mpls-label. diff --git a/v1/proto/gribi_aft/gribi_aft.pb.go b/v1/proto/gribi_aft/gribi_aft.pb.go index a790a0f..2f61773 100644 --- a/v1/proto/gribi_aft/gribi_aft.pb.go +++ b/v1/proto/gribi_aft/gribi_aft.pb.go @@ -9,8 +9,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: v1/proto/gribi_aft/gribi_aft.proto package gribi_aft @@ -33,11 +33,10 @@ const ( ) type Device struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Afts *Afts `protobuf:"bytes,35982132,opt,name=afts,proto3" json:"afts,omitempty"` unknownFields protoimpl.UnknownFields - - Afts *Afts `protobuf:"bytes,35982132,opt,name=afts,proto3" json:"afts,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Device) Reset() { @@ -78,10 +77,7 @@ func (x *Device) GetAfts() *Afts { } type Afts struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Ipv4Entry []*Afts_Ipv4EntryKey `protobuf:"bytes,410397655,rep,name=ipv4_entry,json=ipv4Entry,proto3" json:"ipv4_entry,omitempty"` Ipv6Entry []*Afts_Ipv6EntryKey `protobuf:"bytes,403891971,rep,name=ipv6_entry,json=ipv6Entry,proto3" json:"ipv6_entry,omitempty"` LabelEntry []*Afts_LabelEntryKey `protobuf:"bytes,153428187,rep,name=label_entry,json=labelEntry,proto3" json:"label_entry,omitempty"` @@ -89,6 +85,8 @@ type Afts struct { NextHop []*Afts_NextHopKey `protobuf:"bytes,132654769,rep,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` NextHopGroup []*Afts_NextHopGroupKey `protobuf:"bytes,362999033,rep,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` PolicyForwardingEntry []*Afts_PolicyForwardingEntryKey `protobuf:"bytes,269536139,rep,name=policy_forwarding_entry,json=policyForwardingEntry,proto3" json:"policy_forwarding_entry,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts) Reset() { @@ -171,14 +169,13 @@ func (x *Afts) GetPolicyForwardingEntry() []*Afts_PolicyForwardingEntryKey { } type Afts_Ipv4Entry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` DecapsulateHeader enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,383809427,opt,name=decapsulate_header,json=decapsulateHeader,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"decapsulate_header,omitempty"` EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,290934374,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` NextHopGroup *ywrapper.UintValue `protobuf:"bytes,497198611,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,32856574,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_Ipv4Entry) Reset() { @@ -240,12 +237,11 @@ func (x *Afts_Ipv4Entry) GetNextHopGroupNetworkInstance() *ywrapper.StringValue } type Afts_Ipv4EntryKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` + Ipv4Entry *Afts_Ipv4Entry `protobuf:"bytes,2,opt,name=ipv4_entry,json=ipv4Entry,proto3" json:"ipv4_entry,omitempty"` unknownFields protoimpl.UnknownFields - - Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` - Ipv4Entry *Afts_Ipv4Entry `protobuf:"bytes,2,opt,name=ipv4_entry,json=ipv4Entry,proto3" json:"ipv4_entry,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_Ipv4EntryKey) Reset() { @@ -293,14 +289,13 @@ func (x *Afts_Ipv4EntryKey) GetIpv4Entry() *Afts_Ipv4Entry { } type Afts_Ipv6Entry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` DecapsulateHeader enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,328774623,opt,name=decapsulate_header,json=decapsulateHeader,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"decapsulate_header,omitempty"` EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,11794282,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` NextHopGroup *ywrapper.UintValue `protobuf:"bytes,442121607,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,492017618,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_Ipv6Entry) Reset() { @@ -362,12 +357,11 @@ func (x *Afts_Ipv6Entry) GetNextHopGroupNetworkInstance() *ywrapper.StringValue } type Afts_Ipv6EntryKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` + Ipv6Entry *Afts_Ipv6Entry `protobuf:"bytes,2,opt,name=ipv6_entry,json=ipv6Entry,proto3" json:"ipv6_entry,omitempty"` unknownFields protoimpl.UnknownFields - - Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` - Ipv6Entry *Afts_Ipv6Entry `protobuf:"bytes,2,opt,name=ipv6_entry,json=ipv6Entry,proto3" json:"ipv6_entry,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_Ipv6EntryKey) Reset() { @@ -415,14 +409,13 @@ func (x *Afts_Ipv6EntryKey) GetIpv6Entry() *Afts_Ipv6Entry { } type Afts_LabelEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,100486674,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` NextHopGroup *ywrapper.UintValue `protobuf:"bytes,307713279,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,303628026,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` PoppedMplsLabelStack []*Afts_LabelEntry_PoppedMplsLabelStackUnion `protobuf:"bytes,62799927,rep,name=popped_mpls_label_stack,json=poppedMplsLabelStack,proto3" json:"popped_mpls_label_stack,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_LabelEntry) Reset() { @@ -484,16 +477,15 @@ func (x *Afts_LabelEntry) GetPoppedMplsLabelStack() []*Afts_LabelEntry_PoppedMpl } type Afts_LabelEntryKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Label: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Label: // // *Afts_LabelEntryKey_LabelOpenconfigmplstypesmplslabelenum // *Afts_LabelEntryKey_LabelUint64 - Label isAfts_LabelEntryKey_Label `protobuf_oneof:"label"` - LabelEntry *Afts_LabelEntry `protobuf:"bytes,2,opt,name=label_entry,json=labelEntry,proto3" json:"label_entry,omitempty"` + Label isAfts_LabelEntryKey_Label `protobuf_oneof:"label"` + LabelEntry *Afts_LabelEntry `protobuf:"bytes,2,opt,name=label_entry,json=labelEntry,proto3" json:"label_entry,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_LabelEntryKey) Reset() { @@ -526,23 +518,27 @@ func (*Afts_LabelEntryKey) Descriptor() ([]byte, []int) { return file_v1_proto_gribi_aft_gribi_aft_proto_rawDescGZIP(), []int{1, 5} } -func (m *Afts_LabelEntryKey) GetLabel() isAfts_LabelEntryKey_Label { - if m != nil { - return m.Label +func (x *Afts_LabelEntryKey) GetLabel() isAfts_LabelEntryKey_Label { + if x != nil { + return x.Label } return nil } func (x *Afts_LabelEntryKey) GetLabelOpenconfigmplstypesmplslabelenum() enums.OpenconfigMplsTypesMplsLabelEnum { - if x, ok := x.GetLabel().(*Afts_LabelEntryKey_LabelOpenconfigmplstypesmplslabelenum); ok { - return x.LabelOpenconfigmplstypesmplslabelenum + if x != nil { + if x, ok := x.Label.(*Afts_LabelEntryKey_LabelOpenconfigmplstypesmplslabelenum); ok { + return x.LabelOpenconfigmplstypesmplslabelenum + } } return enums.OpenconfigMplsTypesMplsLabelEnum(0) } func (x *Afts_LabelEntryKey) GetLabelUint64() uint64 { - if x, ok := x.GetLabel().(*Afts_LabelEntryKey_LabelUint64); ok { - return x.LabelUint64 + if x != nil { + if x, ok := x.Label.(*Afts_LabelEntryKey_LabelUint64); ok { + return x.LabelUint64 + } } return 0 } @@ -571,13 +567,12 @@ func (*Afts_LabelEntryKey_LabelOpenconfigmplstypesmplslabelenum) isAfts_LabelEnt func (*Afts_LabelEntryKey_LabelUint64) isAfts_LabelEntryKey_Label() {} type Afts_MacEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,397462192,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` - NextHopGroup *ywrapper.UintValue `protobuf:"bytes,320343041,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` - NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,264313412,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,397462192,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` + NextHopGroup *ywrapper.UintValue `protobuf:"bytes,320343041,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` + NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,264313412,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_MacEntry) Reset() { @@ -632,12 +627,11 @@ func (x *Afts_MacEntry) GetNextHopGroupNetworkInstance() *ywrapper.StringValue { } type Afts_MacEntryKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + MacAddress string `protobuf:"bytes,1,opt,name=mac_address,json=macAddress,proto3" json:"mac_address,omitempty"` + MacEntry *Afts_MacEntry `protobuf:"bytes,2,opt,name=mac_entry,json=macEntry,proto3" json:"mac_entry,omitempty"` unknownFields protoimpl.UnknownFields - - MacAddress string `protobuf:"bytes,1,opt,name=mac_address,json=macAddress,proto3" json:"mac_address,omitempty"` - MacEntry *Afts_MacEntry `protobuf:"bytes,2,opt,name=mac_entry,json=macEntry,proto3" json:"mac_entry,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_MacEntryKey) Reset() { @@ -685,10 +679,7 @@ func (x *Afts_MacEntryKey) GetMacEntry() *Afts_MacEntry { } type Afts_NextHop struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` DecapsulateHeader enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,104970793,opt,name=decapsulate_header,json=decapsulateHeader,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"decapsulate_header,omitempty"` EncapHeader []*Afts_NextHop_EncapHeaderKey `protobuf:"bytes,125711186,rep,name=encap_header,json=encapHeader,proto3" json:"encap_header,omitempty"` EncapsulateHeader enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,69966061,opt,name=encapsulate_header,json=encapsulateHeader,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"encapsulate_header,omitempty"` @@ -702,6 +693,8 @@ type Afts_NextHop struct { PushedMplsLabelStack []*Afts_NextHop_PushedMplsLabelStackUnion `protobuf:"bytes,489592660,rep,name=pushed_mpls_label_stack,json=pushedMplsLabelStack,proto3" json:"pushed_mpls_label_stack,omitempty"` TunnelSrcIpAddress *ywrapper.StringValue `protobuf:"bytes,174262178,opt,name=tunnel_src_ip_address,json=tunnelSrcIpAddress,proto3" json:"tunnel_src_ip_address,omitempty"` VniLabel *ywrapper.UintValue `protobuf:"bytes,209933130,opt,name=vni_label,json=vniLabel,proto3" json:"vni_label,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop) Reset() { @@ -826,13 +819,12 @@ func (x *Afts_NextHop) GetVniLabel() *ywrapper.UintValue { } type Afts_NextHopGroup struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` BackupNextHopGroup *ywrapper.UintValue `protobuf:"bytes,366506898,opt,name=backup_next_hop_group,json=backupNextHopGroup,proto3" json:"backup_next_hop_group,omitempty"` Color *ywrapper.UintValue `protobuf:"bytes,242427279,opt,name=color,proto3" json:"color,omitempty"` NextHop []*Afts_NextHopGroup_NextHopKey `protobuf:"bytes,211071474,rep,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_NextHopGroup) Reset() { @@ -887,12 +879,11 @@ func (x *Afts_NextHopGroup) GetNextHop() []*Afts_NextHopGroup_NextHopKey { } type Afts_NextHopGroupKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + NextHopGroup *Afts_NextHopGroup `protobuf:"bytes,2,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` unknownFields protoimpl.UnknownFields - - Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - NextHopGroup *Afts_NextHopGroup `protobuf:"bytes,2,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHopGroupKey) Reset() { @@ -940,12 +931,11 @@ func (x *Afts_NextHopGroupKey) GetNextHopGroup() *Afts_NextHopGroup { } type Afts_NextHopKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` + NextHop *Afts_NextHop `protobuf:"bytes,2,opt,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` unknownFields protoimpl.UnknownFields - - Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` - NextHop *Afts_NextHop `protobuf:"bytes,2,opt,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHopKey) Reset() { @@ -993,14 +983,11 @@ func (x *Afts_NextHopKey) GetNextHop() *Afts_NextHop { } type Afts_PolicyForwardingEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,141950242,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` - IpDscp *ywrapper.UintValue `protobuf:"bytes,350830798,opt,name=ip_dscp,json=ipDscp,proto3" json:"ip_dscp,omitempty"` - IpPrefix *ywrapper.StringValue `protobuf:"bytes,66278688,opt,name=ip_prefix,json=ipPrefix,proto3" json:"ip_prefix,omitempty"` - // Types that are assignable to IpProtocol: + state protoimpl.MessageState `protogen:"open.v1"` + EntryMetadata *ywrapper.BytesValue `protobuf:"bytes,141950242,opt,name=entry_metadata,json=entryMetadata,proto3" json:"entry_metadata,omitempty"` + IpDscp *ywrapper.UintValue `protobuf:"bytes,350830798,opt,name=ip_dscp,json=ipDscp,proto3" json:"ip_dscp,omitempty"` + IpPrefix *ywrapper.StringValue `protobuf:"bytes,66278688,opt,name=ip_prefix,json=ipPrefix,proto3" json:"ip_prefix,omitempty"` + // Types that are valid to be assigned to IpProtocol: // // *Afts_PolicyForwardingEntry_IpProtocolOpenconfigpacketmatchtypesipprotocol // *Afts_PolicyForwardingEntry_IpProtocolUint64 @@ -1008,7 +995,7 @@ type Afts_PolicyForwardingEntry struct { L4DstPort *ywrapper.UintValue `protobuf:"bytes,447405406,opt,name=l4_dst_port,json=l4DstPort,proto3" json:"l4_dst_port,omitempty"` L4SrcPort *ywrapper.UintValue `protobuf:"bytes,502173263,opt,name=l4_src_port,json=l4SrcPort,proto3" json:"l4_src_port,omitempty"` MacAddress *ywrapper.StringValue `protobuf:"bytes,422272134,opt,name=mac_address,json=macAddress,proto3" json:"mac_address,omitempty"` - // Types that are assignable to MplsLabel: + // Types that are valid to be assigned to MplsLabel: // // *Afts_PolicyForwardingEntry_MplsLabelOpenconfigmplstypesmplslabelenum // *Afts_PolicyForwardingEntry_MplsLabelUint64 @@ -1016,6 +1003,8 @@ type Afts_PolicyForwardingEntry struct { MplsTc *ywrapper.UintValue `protobuf:"bytes,281754514,opt,name=mpls_tc,json=mplsTc,proto3" json:"mpls_tc,omitempty"` NextHopGroup *ywrapper.UintValue `protobuf:"bytes,188303215,opt,name=next_hop_group,json=nextHopGroup,proto3" json:"next_hop_group,omitempty"` NextHopGroupNetworkInstance *ywrapper.StringValue `protobuf:"bytes,466188650,opt,name=next_hop_group_network_instance,json=nextHopGroupNetworkInstance,proto3" json:"next_hop_group_network_instance,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_PolicyForwardingEntry) Reset() { @@ -1069,23 +1058,27 @@ func (x *Afts_PolicyForwardingEntry) GetIpPrefix() *ywrapper.StringValue { return nil } -func (m *Afts_PolicyForwardingEntry) GetIpProtocol() isAfts_PolicyForwardingEntry_IpProtocol { - if m != nil { - return m.IpProtocol +func (x *Afts_PolicyForwardingEntry) GetIpProtocol() isAfts_PolicyForwardingEntry_IpProtocol { + if x != nil { + return x.IpProtocol } return nil } func (x *Afts_PolicyForwardingEntry) GetIpProtocolOpenconfigpacketmatchtypesipprotocol() enums.OpenconfigPacketMatchTypesIPPROTOCOL { - if x, ok := x.GetIpProtocol().(*Afts_PolicyForwardingEntry_IpProtocolOpenconfigpacketmatchtypesipprotocol); ok { - return x.IpProtocolOpenconfigpacketmatchtypesipprotocol + if x != nil { + if x, ok := x.IpProtocol.(*Afts_PolicyForwardingEntry_IpProtocolOpenconfigpacketmatchtypesipprotocol); ok { + return x.IpProtocolOpenconfigpacketmatchtypesipprotocol + } } return enums.OpenconfigPacketMatchTypesIPPROTOCOL(0) } func (x *Afts_PolicyForwardingEntry) GetIpProtocolUint64() uint64 { - if x, ok := x.GetIpProtocol().(*Afts_PolicyForwardingEntry_IpProtocolUint64); ok { - return x.IpProtocolUint64 + if x != nil { + if x, ok := x.IpProtocol.(*Afts_PolicyForwardingEntry_IpProtocolUint64); ok { + return x.IpProtocolUint64 + } } return 0 } @@ -1111,23 +1104,27 @@ func (x *Afts_PolicyForwardingEntry) GetMacAddress() *ywrapper.StringValue { return nil } -func (m *Afts_PolicyForwardingEntry) GetMplsLabel() isAfts_PolicyForwardingEntry_MplsLabel { - if m != nil { - return m.MplsLabel +func (x *Afts_PolicyForwardingEntry) GetMplsLabel() isAfts_PolicyForwardingEntry_MplsLabel { + if x != nil { + return x.MplsLabel } return nil } func (x *Afts_PolicyForwardingEntry) GetMplsLabelOpenconfigmplstypesmplslabelenum() enums.OpenconfigMplsTypesMplsLabelEnum { - if x, ok := x.GetMplsLabel().(*Afts_PolicyForwardingEntry_MplsLabelOpenconfigmplstypesmplslabelenum); ok { - return x.MplsLabelOpenconfigmplstypesmplslabelenum + if x != nil { + if x, ok := x.MplsLabel.(*Afts_PolicyForwardingEntry_MplsLabelOpenconfigmplstypesmplslabelenum); ok { + return x.MplsLabelOpenconfigmplstypesmplslabelenum + } } return enums.OpenconfigMplsTypesMplsLabelEnum(0) } func (x *Afts_PolicyForwardingEntry) GetMplsLabelUint64() uint64 { - if x, ok := x.GetMplsLabel().(*Afts_PolicyForwardingEntry_MplsLabelUint64); ok { - return x.MplsLabelUint64 + if x != nil { + if x, ok := x.MplsLabel.(*Afts_PolicyForwardingEntry_MplsLabelUint64); ok { + return x.MplsLabelUint64 + } } return 0 } @@ -1188,12 +1185,11 @@ func (*Afts_PolicyForwardingEntry_MplsLabelOpenconfigmplstypesmplslabelenum) isA func (*Afts_PolicyForwardingEntry_MplsLabelUint64) isAfts_PolicyForwardingEntry_MplsLabel() {} type Afts_PolicyForwardingEntryKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` PolicyForwardingEntry *Afts_PolicyForwardingEntry `protobuf:"bytes,2,opt,name=policy_forwarding_entry,json=policyForwardingEntry,proto3" json:"policy_forwarding_entry,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_PolicyForwardingEntryKey) Reset() { @@ -1241,12 +1237,11 @@ func (x *Afts_PolicyForwardingEntryKey) GetPolicyForwardingEntry() *Afts_PolicyF } type Afts_LabelEntry_PoppedMplsLabelStackUnion struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` PoppedMplsLabelStackOpenconfigmplstypesmplslabelenum enums.OpenconfigMplsTypesMplsLabelEnum `protobuf:"varint,524692292,opt,name=popped_mpls_label_stack_openconfigmplstypesmplslabelenum,json=poppedMplsLabelStackOpenconfigmplstypesmplslabelenum,proto3,enum=gribi_aft.enums.OpenconfigMplsTypesMplsLabelEnum" json:"popped_mpls_label_stack_openconfigmplstypesmplslabelenum,omitempty"` PoppedMplsLabelStackUint64 uint64 `protobuf:"varint,510588408,opt,name=popped_mpls_label_stack_uint64,json=poppedMplsLabelStackUint64,proto3" json:"popped_mpls_label_stack_uint64,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_LabelEntry_PoppedMplsLabelStackUnion) Reset() { @@ -1294,17 +1289,16 @@ func (x *Afts_LabelEntry_PoppedMplsLabelStackUnion) GetPoppedMplsLabelStackUint6 } type Afts_NextHop_EncapHeader struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Gre *Afts_NextHop_EncapHeader_Gre `protobuf:"bytes,301373623,opt,name=gre,proto3" json:"gre,omitempty"` + Ipv4 *Afts_NextHop_EncapHeader_Ipv4 `protobuf:"bytes,191386200,opt,name=ipv4,proto3" json:"ipv4,omitempty"` + Ipv6 *Afts_NextHop_EncapHeader_Ipv6 `protobuf:"bytes,191386202,opt,name=ipv6,proto3" json:"ipv6,omitempty"` + Mpls *Afts_NextHop_EncapHeader_Mpls `protobuf:"bytes,393605309,opt,name=mpls,proto3" json:"mpls,omitempty"` + Type enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,254997883,opt,name=type,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"type,omitempty"` + UdpV4 *Afts_NextHop_EncapHeader_UdpV4 `protobuf:"bytes,171499561,opt,name=udp_v4,json=udpV4,proto3" json:"udp_v4,omitempty"` + UdpV6 *Afts_NextHop_EncapHeader_UdpV6 `protobuf:"bytes,171499563,opt,name=udp_v6,json=udpV6,proto3" json:"udp_v6,omitempty"` unknownFields protoimpl.UnknownFields - - Gre *Afts_NextHop_EncapHeader_Gre `protobuf:"bytes,301373623,opt,name=gre,proto3" json:"gre,omitempty"` - Ipv4 *Afts_NextHop_EncapHeader_Ipv4 `protobuf:"bytes,191386200,opt,name=ipv4,proto3" json:"ipv4,omitempty"` - Ipv6 *Afts_NextHop_EncapHeader_Ipv6 `protobuf:"bytes,191386202,opt,name=ipv6,proto3" json:"ipv6,omitempty"` - Mpls *Afts_NextHop_EncapHeader_Mpls `protobuf:"bytes,393605309,opt,name=mpls,proto3" json:"mpls,omitempty"` - Type enums.OpenconfigAftTypesEncapsulationHeaderType `protobuf:"varint,254997883,opt,name=type,proto3,enum=gribi_aft.enums.OpenconfigAftTypesEncapsulationHeaderType" json:"type,omitempty"` - UdpV4 *Afts_NextHop_EncapHeader_UdpV4 `protobuf:"bytes,171499561,opt,name=udp_v4,json=udpV4,proto3" json:"udp_v4,omitempty"` - UdpV6 *Afts_NextHop_EncapHeader_UdpV6 `protobuf:"bytes,171499563,opt,name=udp_v6,json=udpV6,proto3" json:"udp_v6,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader) Reset() { @@ -1387,12 +1381,11 @@ func (x *Afts_NextHop_EncapHeader) GetUdpV6() *Afts_NextHop_EncapHeader_UdpV6 { } type Afts_NextHop_EncapHeaderKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` + EncapHeader *Afts_NextHop_EncapHeader `protobuf:"bytes,2,opt,name=encap_header,json=encapHeader,proto3" json:"encap_header,omitempty"` unknownFields protoimpl.UnknownFields - - Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` - EncapHeader *Afts_NextHop_EncapHeader `protobuf:"bytes,2,opt,name=encap_header,json=encapHeader,proto3" json:"encap_header,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeaderKey) Reset() { @@ -1440,13 +1433,12 @@ func (x *Afts_NextHop_EncapHeaderKey) GetEncapHeader() *Afts_NextHop_EncapHeader } type Afts_NextHop_Gre struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DstIp *ywrapper.StringValue `protobuf:"bytes,434950232,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,440591545,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + Ttl *ywrapper.UintValue `protobuf:"bytes,108564691,opt,name=ttl,proto3" json:"ttl,omitempty"` unknownFields protoimpl.UnknownFields - - DstIp *ywrapper.StringValue `protobuf:"bytes,434950232,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,440591545,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` - Ttl *ywrapper.UintValue `protobuf:"bytes,108564691,opt,name=ttl,proto3" json:"ttl,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_Gre) Reset() { @@ -1501,12 +1493,11 @@ func (x *Afts_NextHop_Gre) GetTtl() *ywrapper.UintValue { } type Afts_NextHop_InterfaceRef struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Interface *ywrapper.StringValue `protobuf:"bytes,366751031,opt,name=interface,proto3" json:"interface,omitempty"` + Subinterface *ywrapper.UintValue `protobuf:"bytes,488145333,opt,name=subinterface,proto3" json:"subinterface,omitempty"` unknownFields protoimpl.UnknownFields - - Interface *ywrapper.StringValue `protobuf:"bytes,366751031,opt,name=interface,proto3" json:"interface,omitempty"` - Subinterface *ywrapper.UintValue `protobuf:"bytes,488145333,opt,name=subinterface,proto3" json:"subinterface,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_InterfaceRef) Reset() { @@ -1554,12 +1545,11 @@ func (x *Afts_NextHop_InterfaceRef) GetSubinterface() *ywrapper.UintValue { } type Afts_NextHop_IpInIp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DstIp *ywrapper.StringValue `protobuf:"bytes,184775743,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,220560118,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` unknownFields protoimpl.UnknownFields - - DstIp *ywrapper.StringValue `protobuf:"bytes,184775743,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,220560118,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_IpInIp) Reset() { @@ -1607,12 +1597,11 @@ func (x *Afts_NextHop_IpInIp) GetSrcIp() *ywrapper.StringValue { } type Afts_NextHop_PushedMplsLabelStackUnion struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` PushedMplsLabelStackOpenconfigmplstypesmplslabelenum enums.OpenconfigMplsTypesMplsLabelEnum `protobuf:"varint,307755077,opt,name=pushed_mpls_label_stack_openconfigmplstypesmplslabelenum,json=pushedMplsLabelStackOpenconfigmplstypesmplslabelenum,proto3,enum=gribi_aft.enums.OpenconfigMplsTypesMplsLabelEnum" json:"pushed_mpls_label_stack_openconfigmplstypesmplslabelenum,omitempty"` PushedMplsLabelStackUint64 uint64 `protobuf:"varint,47493573,opt,name=pushed_mpls_label_stack_uint64,json=pushedMplsLabelStackUint64,proto3" json:"pushed_mpls_label_stack_uint64,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_PushedMplsLabelStackUnion) Reset() { @@ -1660,13 +1649,12 @@ func (x *Afts_NextHop_PushedMplsLabelStackUnion) GetPushedMplsLabelStackUint64() } type Afts_NextHop_EncapHeader_Gre struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DstIp *ywrapper.StringValue `protobuf:"bytes,330920437,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,509569356,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + Ttl *ywrapper.UintValue `protobuf:"bytes,267157040,opt,name=ttl,proto3" json:"ttl,omitempty"` unknownFields protoimpl.UnknownFields - - DstIp *ywrapper.StringValue `protobuf:"bytes,330920437,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,509569356,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` - Ttl *ywrapper.UintValue `protobuf:"bytes,267157040,opt,name=ttl,proto3" json:"ttl,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_Gre) Reset() { @@ -1721,12 +1709,11 @@ func (x *Afts_NextHop_EncapHeader_Gre) GetTtl() *ywrapper.UintValue { } type Afts_NextHop_EncapHeader_Ipv4 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DstIp *ywrapper.StringValue `protobuf:"bytes,403354420,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,293130725,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` unknownFields protoimpl.UnknownFields - - DstIp *ywrapper.StringValue `protobuf:"bytes,403354420,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,293130725,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_Ipv4) Reset() { @@ -1774,12 +1761,11 @@ func (x *Afts_NextHop_EncapHeader_Ipv4) GetSrcIp() *ywrapper.StringValue { } type Afts_NextHop_EncapHeader_Ipv6 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DstIp *ywrapper.StringValue `protobuf:"bytes,469869578,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,254664891,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` unknownFields protoimpl.UnknownFields - - DstIp *ywrapper.StringValue `protobuf:"bytes,469869578,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,254664891,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_Ipv6) Reset() { @@ -1827,12 +1813,11 @@ func (x *Afts_NextHop_EncapHeader_Ipv6) GetSrcIp() *ywrapper.StringValue { } type Afts_NextHop_EncapHeader_Mpls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` MplsLabelStack []*Afts_NextHop_EncapHeader_Mpls_MplsLabelStackUnion `protobuf:"bytes,310218456,rep,name=mpls_label_stack,json=mplsLabelStack,proto3" json:"mpls_label_stack,omitempty"` TrafficClass *ywrapper.UintValue `protobuf:"bytes,380564126,opt,name=traffic_class,json=trafficClass,proto3" json:"traffic_class,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_Mpls) Reset() { @@ -1880,16 +1865,15 @@ func (x *Afts_NextHop_EncapHeader_Mpls) GetTrafficClass() *ywrapper.UintValue { } type Afts_NextHop_EncapHeader_UdpV4 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Dscp *ywrapper.UintValue `protobuf:"bytes,404304264,opt,name=dscp,proto3" json:"dscp,omitempty"` + DstIp *ywrapper.StringValue `protobuf:"bytes,425782075,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + DstUdpPort *ywrapper.UintValue `protobuf:"bytes,26930775,opt,name=dst_udp_port,json=dstUdpPort,proto3" json:"dst_udp_port,omitempty"` + IpTtl *ywrapper.UintValue `protobuf:"bytes,489501006,opt,name=ip_ttl,json=ipTtl,proto3" json:"ip_ttl,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,223532242,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + SrcUdpPort *ywrapper.UintValue `protobuf:"bytes,332943154,opt,name=src_udp_port,json=srcUdpPort,proto3" json:"src_udp_port,omitempty"` unknownFields protoimpl.UnknownFields - - Dscp *ywrapper.UintValue `protobuf:"bytes,404304264,opt,name=dscp,proto3" json:"dscp,omitempty"` - DstIp *ywrapper.StringValue `protobuf:"bytes,425782075,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - DstUdpPort *ywrapper.UintValue `protobuf:"bytes,26930775,opt,name=dst_udp_port,json=dstUdpPort,proto3" json:"dst_udp_port,omitempty"` - IpTtl *ywrapper.UintValue `protobuf:"bytes,489501006,opt,name=ip_ttl,json=ipTtl,proto3" json:"ip_ttl,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,223532242,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` - SrcUdpPort *ywrapper.UintValue `protobuf:"bytes,332943154,opt,name=src_udp_port,json=srcUdpPort,proto3" json:"src_udp_port,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_UdpV4) Reset() { @@ -1965,16 +1949,15 @@ func (x *Afts_NextHop_EncapHeader_UdpV4) GetSrcUdpPort() *ywrapper.UintValue { } type Afts_NextHop_EncapHeader_UdpV6 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Dscp *ywrapper.UintValue `protobuf:"bytes,493128346,opt,name=dscp,proto3" json:"dscp,omitempty"` + DstIp *ywrapper.StringValue `protobuf:"bytes,148029921,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` + DstUdpPort *ywrapper.UintValue `protobuf:"bytes,275733981,opt,name=dst_udp_port,json=dstUdpPort,proto3" json:"dst_udp_port,omitempty"` + IpTtl *ywrapper.UintValue `protobuf:"bytes,394480800,opt,name=ip_ttl,json=ipTtl,proto3" json:"ip_ttl,omitempty"` + SrcIp *ywrapper.StringValue `protobuf:"bytes,494881688,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` + SrcUdpPort *ywrapper.UintValue `protobuf:"bytes,485812424,opt,name=src_udp_port,json=srcUdpPort,proto3" json:"src_udp_port,omitempty"` unknownFields protoimpl.UnknownFields - - Dscp *ywrapper.UintValue `protobuf:"bytes,493128346,opt,name=dscp,proto3" json:"dscp,omitempty"` - DstIp *ywrapper.StringValue `protobuf:"bytes,148029921,opt,name=dst_ip,json=dstIp,proto3" json:"dst_ip,omitempty"` - DstUdpPort *ywrapper.UintValue `protobuf:"bytes,275733981,opt,name=dst_udp_port,json=dstUdpPort,proto3" json:"dst_udp_port,omitempty"` - IpTtl *ywrapper.UintValue `protobuf:"bytes,394480800,opt,name=ip_ttl,json=ipTtl,proto3" json:"ip_ttl,omitempty"` - SrcIp *ywrapper.StringValue `protobuf:"bytes,494881688,opt,name=src_ip,json=srcIp,proto3" json:"src_ip,omitempty"` - SrcUdpPort *ywrapper.UintValue `protobuf:"bytes,485812424,opt,name=src_udp_port,json=srcUdpPort,proto3" json:"src_udp_port,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_UdpV6) Reset() { @@ -2050,12 +2033,11 @@ func (x *Afts_NextHop_EncapHeader_UdpV6) GetSrcUdpPort() *ywrapper.UintValue { } type Afts_NextHop_EncapHeader_Mpls_MplsLabelStackUnion struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` MplsLabelStackOpenconfigmplstypesmplslabelenum enums.OpenconfigMplsTypesMplsLabelEnum `protobuf:"varint,212167609,opt,name=mpls_label_stack_openconfigmplstypesmplslabelenum,json=mplsLabelStackOpenconfigmplstypesmplslabelenum,proto3,enum=gribi_aft.enums.OpenconfigMplsTypesMplsLabelEnum" json:"mpls_label_stack_openconfigmplstypesmplslabelenum,omitempty"` MplsLabelStackUint64 uint64 `protobuf:"varint,205621201,opt,name=mpls_label_stack_uint64,json=mplsLabelStackUint64,proto3" json:"mpls_label_stack_uint64,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Afts_NextHop_EncapHeader_Mpls_MplsLabelStackUnion) Reset() { @@ -2103,11 +2085,10 @@ func (x *Afts_NextHop_EncapHeader_Mpls_MplsLabelStackUnion) GetMplsLabelStackUin } type Afts_NextHopGroup_NextHop struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Weight *ywrapper.UintValue `protobuf:"bytes,202140175,opt,name=weight,proto3" json:"weight,omitempty"` unknownFields protoimpl.UnknownFields - - Weight *ywrapper.UintValue `protobuf:"bytes,202140175,opt,name=weight,proto3" json:"weight,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHopGroup_NextHop) Reset() { @@ -2148,12 +2129,11 @@ func (x *Afts_NextHopGroup_NextHop) GetWeight() *ywrapper.UintValue { } type Afts_NextHopGroup_NextHopKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` + NextHop *Afts_NextHopGroup_NextHop `protobuf:"bytes,2,opt,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` unknownFields protoimpl.UnknownFields - - Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` - NextHop *Afts_NextHopGroup_NextHop `protobuf:"bytes,2,opt,name=next_hop,json=nextHop,proto3" json:"next_hop,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Afts_NextHopGroup_NextHopKey) Reset() { diff --git a/v1/proto/service/gribi.pb.go b/v1/proto/service/gribi.pb.go index 7b9265f..8aee52a 100644 --- a/v1/proto/service/gribi.pb.go +++ b/v1/proto/service/gribi.pb.go @@ -14,8 +14,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: v1/proto/service/gribi.proto package gribi @@ -746,10 +746,7 @@ func (FlushResponseError_Reason) EnumDescriptor() ([]byte, []int) { // in the same message the server should return an error specifying // the `INVALID_ARGUMENT` canonical error code. type ModifyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A group of requests to add/modify/remove a single AFT entry. // // A gRIBI server : @@ -841,7 +838,9 @@ type ModifyRequest struct { // set to INVALID_ARGUMENT. // The election_id can only be increased monotonically by a client // during a RPC session. This simplifies server implementation. - ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ModifyRequest) Reset() { @@ -897,10 +896,7 @@ func (x *ModifyRequest) GetElectionId() *Uint128 { // A single request to add/modify/remove a single AFT entry type AFTOperation struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Associate an ID with this specific request since this allows the client // to determine exactly which modifications have been completed in the // case that are multiple operations within the AFT. @@ -912,7 +908,7 @@ type AFTOperation struct { // carried along with the RPC response. NetworkInstance string `protobuf:"bytes,2,opt,name=network_instance,json=networkInstance,proto3" json:"network_instance,omitempty"` Op AFTOperation_Operation `protobuf:"varint,3,opt,name=op,proto3,enum=gribi.AFTOperation_Operation" json:"op,omitempty"` - // Types that are assignable to Entry: + // Types that are valid to be assigned to Entry: // // *AFTOperation_Ipv4 // *AFTOperation_Ipv6 @@ -935,7 +931,9 @@ type AFTOperation struct { // // If the election_id in the AFTOperation does not meet these criteria // the server discards the AFTOperation and returns FAILED in AFTResult - ElectionId *Uint128 `protobuf:"bytes,11,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + ElectionId *Uint128 `protobuf:"bytes,11,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AFTOperation) Reset() { @@ -989,58 +987,72 @@ func (x *AFTOperation) GetOp() AFTOperation_Operation { return AFTOperation_INVALID } -func (m *AFTOperation) GetEntry() isAFTOperation_Entry { - if m != nil { - return m.Entry +func (x *AFTOperation) GetEntry() isAFTOperation_Entry { + if x != nil { + return x.Entry } return nil } func (x *AFTOperation) GetIpv4() *gribi_aft.Afts_Ipv4EntryKey { - if x, ok := x.GetEntry().(*AFTOperation_Ipv4); ok { - return x.Ipv4 + if x != nil { + if x, ok := x.Entry.(*AFTOperation_Ipv4); ok { + return x.Ipv4 + } } return nil } func (x *AFTOperation) GetIpv6() *gribi_aft.Afts_Ipv6EntryKey { - if x, ok := x.GetEntry().(*AFTOperation_Ipv6); ok { - return x.Ipv6 + if x != nil { + if x, ok := x.Entry.(*AFTOperation_Ipv6); ok { + return x.Ipv6 + } } return nil } func (x *AFTOperation) GetMpls() *gribi_aft.Afts_LabelEntryKey { - if x, ok := x.GetEntry().(*AFTOperation_Mpls); ok { - return x.Mpls + if x != nil { + if x, ok := x.Entry.(*AFTOperation_Mpls); ok { + return x.Mpls + } } return nil } func (x *AFTOperation) GetNextHopGroup() *gribi_aft.Afts_NextHopGroupKey { - if x, ok := x.GetEntry().(*AFTOperation_NextHopGroup); ok { - return x.NextHopGroup + if x != nil { + if x, ok := x.Entry.(*AFTOperation_NextHopGroup); ok { + return x.NextHopGroup + } } return nil } func (x *AFTOperation) GetNextHop() *gribi_aft.Afts_NextHopKey { - if x, ok := x.GetEntry().(*AFTOperation_NextHop); ok { - return x.NextHop + if x != nil { + if x, ok := x.Entry.(*AFTOperation_NextHop); ok { + return x.NextHop + } } return nil } func (x *AFTOperation) GetMacEntry() *gribi_aft.Afts_MacEntryKey { - if x, ok := x.GetEntry().(*AFTOperation_MacEntry); ok { - return x.MacEntry + if x != nil { + if x, ok := x.Entry.(*AFTOperation_MacEntry); ok { + return x.MacEntry + } } return nil } func (x *AFTOperation) GetPolicyForwardingEntry() *gribi_aft.Afts_PolicyForwardingEntryKey { - if x, ok := x.GetEntry().(*AFTOperation_PolicyForwardingEntry); ok { - return x.PolicyForwardingEntry + if x != nil { + if x, ok := x.Entry.(*AFTOperation_PolicyForwardingEntry); ok { + return x.PolicyForwardingEntry + } } return nil } @@ -1118,10 +1130,7 @@ func (*AFTOperation_PolicyForwardingEntry) isAFTOperation_Entry() {} // A set of AFT responses. type ModifyResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // One or more responses to requests. Clients should expect that // the ModifyResponse *does not* correlate to the ModifyRequest’s // contents. @@ -1135,7 +1144,9 @@ type ModifyResponse struct { // The network element sends a ModifyResponse with only the election_id // populated. The value populated is the highest election_id that the // network element has learnt from any client. - ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + ElectionId *Uint128 `protobuf:"bytes,3,opt,name=election_id,json=electionId,proto3" json:"election_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ModifyResponse) Reset() { @@ -1191,10 +1202,7 @@ func (x *ModifyResponse) GetElectionId() *Uint128 { // A response to add/modify/remove a single AFT entry type AFTResult struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The ID corresponds to the operation ID that was // specified in the AFTOperation. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` @@ -1208,7 +1216,9 @@ type AFTResult struct { // The timestamp is expressed as nanoseconds since the Unix Epoch in UTC. Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Contains error details if status is FAILED or FIB_FAILED. - ErrorDetails *AFTErrorDetails `protobuf:"bytes,4,opt,name=error_details,json=errorDetails,proto3" json:"error_details,omitempty"` + ErrorDetails *AFTErrorDetails `protobuf:"bytes,4,opt,name=error_details,json=errorDetails,proto3" json:"error_details,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AFTResult) Reset() { @@ -1271,13 +1281,12 @@ func (x *AFTResult) GetErrorDetails() *AFTErrorDetails { // Populated in 'error_details' in AFTResult for failed operations. type AFTErrorDetails struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Human-readable error message in the case that status is FAILED // or FIB_FAILED. - ErrorMessage string `protobuf:"bytes,1,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` + ErrorMessage string `protobuf:"bytes,1,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AFTErrorDetails) Reset() { @@ -1320,11 +1329,10 @@ func (x *AFTErrorDetails) GetErrorMessage() string { // Populated in `details` in status.proto when an error that causes the network // element to close the stream. type ModifyRPCErrorDetails struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Reason ModifyRPCErrorDetails_Reason `protobuf:"varint,1,opt,name=reason,proto3,enum=gribi.ModifyRPCErrorDetails_Reason" json:"reason,omitempty"` unknownFields protoimpl.UnknownFields - - Reason ModifyRPCErrorDetails_Reason `protobuf:"varint,1,opt,name=reason,proto3,enum=gribi.ModifyRPCErrorDetails_Reason" json:"reason,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ModifyRPCErrorDetails) Reset() { @@ -1367,11 +1375,10 @@ func (x *ModifyRPCErrorDetails) GetReason() ModifyRPCErrorDetails_Reason { // Response when ModifyRequest.params is syntactically valid and all // requested parameters are supported by the network element. type SessionParametersResult struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Status SessionParametersResult_Status `protobuf:"varint,1,opt,name=status,proto3,enum=gribi.SessionParametersResult_Status" json:"status,omitempty"` unknownFields protoimpl.UnknownFields - - Status SessionParametersResult_Status `protobuf:"varint,1,opt,name=status,proto3,enum=gribi.SessionParametersResult_Status" json:"status,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SessionParametersResult) Reset() { @@ -1412,12 +1419,11 @@ func (x *SessionParametersResult) GetStatus() SessionParametersResult_Status { } type Uint128 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + High uint64 `protobuf:"varint,1,opt,name=high,proto3" json:"high,omitempty"` + Low uint64 `protobuf:"varint,2,opt,name=low,proto3" json:"low,omitempty"` unknownFields protoimpl.UnknownFields - - High uint64 `protobuf:"varint,1,opt,name=high,proto3" json:"high,omitempty"` - Low uint64 `protobuf:"varint,2,opt,name=low,proto3" json:"low,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Uint128) Reset() { @@ -1465,13 +1471,12 @@ func (x *Uint128) GetLow() uint64 { } type SessionParameters struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Redundancy SessionParameters_ClientRedundancy `protobuf:"varint,1,opt,name=redundancy,proto3,enum=gribi.SessionParameters_ClientRedundancy" json:"redundancy,omitempty"` + Persistence SessionParameters_AFTPersistence `protobuf:"varint,2,opt,name=persistence,proto3,enum=gribi.SessionParameters_AFTPersistence" json:"persistence,omitempty"` + AckType SessionParameters_AFTResultStatusType `protobuf:"varint,3,opt,name=ack_type,json=ackType,proto3,enum=gribi.SessionParameters_AFTResultStatusType" json:"ack_type,omitempty"` unknownFields protoimpl.UnknownFields - - Redundancy SessionParameters_ClientRedundancy `protobuf:"varint,1,opt,name=redundancy,proto3,enum=gribi.SessionParameters_ClientRedundancy" json:"redundancy,omitempty"` - Persistence SessionParameters_AFTPersistence `protobuf:"varint,2,opt,name=persistence,proto3,enum=gribi.SessionParameters_AFTPersistence" json:"persistence,omitempty"` - AckType SessionParameters_AFTResultStatusType `protobuf:"varint,3,opt,name=ack_type,json=ackType,proto3,enum=gribi.SessionParameters_AFTResultStatusType" json:"ack_type,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SessionParameters) Reset() { @@ -1528,9 +1533,9 @@ func (x *SessionParameters) GetAckType() SessionParameters_AFTResultStatusType { // Empty is a specific message that is used as a marker where // presence of a non-nil value indicates a particular function. type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -1564,11 +1569,8 @@ func (*Empty) Descriptor() ([]byte, []int) { } type GetRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to NetworkInstance: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to NetworkInstance: // // *GetRequest_Name // *GetRequest_All @@ -1578,7 +1580,9 @@ type GetRequest struct { // error code. If the AFT is unsupported, it should respond with // UNIMPLEMENTED in the status.proto carried along with the RPC // response. - Aft AFTType `protobuf:"varint,3,opt,name=aft,proto3,enum=gribi.AFTType" json:"aft,omitempty"` + Aft AFTType `protobuf:"varint,3,opt,name=aft,proto3,enum=gribi.AFTType" json:"aft,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetRequest) Reset() { @@ -1611,23 +1615,27 @@ func (*GetRequest) Descriptor() ([]byte, []int) { return file_v1_proto_service_gribi_proto_rawDescGZIP(), []int{10} } -func (m *GetRequest) GetNetworkInstance() isGetRequest_NetworkInstance { - if m != nil { - return m.NetworkInstance +func (x *GetRequest) GetNetworkInstance() isGetRequest_NetworkInstance { + if x != nil { + return x.NetworkInstance } return nil } func (x *GetRequest) GetName() string { - if x, ok := x.GetNetworkInstance().(*GetRequest_Name); ok { - return x.Name + if x != nil { + if x, ok := x.NetworkInstance.(*GetRequest_Name); ok { + return x.Name + } } return "" } func (x *GetRequest) GetAll() *Empty { - if x, ok := x.GetNetworkInstance().(*GetRequest_All); ok { - return x.All + if x != nil { + if x, ok := x.NetworkInstance.(*GetRequest_All); ok { + return x.All + } } return nil } @@ -1665,13 +1673,10 @@ func (*GetRequest_All) isGetRequest_NetworkInstance() {} // An individual AFTEntry that is installed on the device. type AFTEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The network_instance for which the response is being returned. NetworkInstance string `protobuf:"bytes,1,opt,name=network_instance,json=networkInstance,proto3" json:"network_instance,omitempty"` - // Types that are assignable to Entry: + // Types that are valid to be assigned to Entry: // // *AFTEntry_Ipv4 // *AFTEntry_Ipv6 @@ -1684,7 +1689,9 @@ type AFTEntry struct { // RIB programming status of the entry. RibStatus AFTEntry_Status `protobuf:"varint,11,opt,name=rib_status,json=ribStatus,proto3,enum=gribi.AFTEntry_Status" json:"rib_status,omitempty"` // FIB programming status of the entry. - FibStatus AFTEntry_Status `protobuf:"varint,12,opt,name=fib_status,json=fibStatus,proto3,enum=gribi.AFTEntry_Status" json:"fib_status,omitempty"` + FibStatus AFTEntry_Status `protobuf:"varint,12,opt,name=fib_status,json=fibStatus,proto3,enum=gribi.AFTEntry_Status" json:"fib_status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AFTEntry) Reset() { @@ -1724,58 +1731,72 @@ func (x *AFTEntry) GetNetworkInstance() string { return "" } -func (m *AFTEntry) GetEntry() isAFTEntry_Entry { - if m != nil { - return m.Entry +func (x *AFTEntry) GetEntry() isAFTEntry_Entry { + if x != nil { + return x.Entry } return nil } func (x *AFTEntry) GetIpv4() *gribi_aft.Afts_Ipv4EntryKey { - if x, ok := x.GetEntry().(*AFTEntry_Ipv4); ok { - return x.Ipv4 + if x != nil { + if x, ok := x.Entry.(*AFTEntry_Ipv4); ok { + return x.Ipv4 + } } return nil } func (x *AFTEntry) GetIpv6() *gribi_aft.Afts_Ipv6EntryKey { - if x, ok := x.GetEntry().(*AFTEntry_Ipv6); ok { - return x.Ipv6 + if x != nil { + if x, ok := x.Entry.(*AFTEntry_Ipv6); ok { + return x.Ipv6 + } } return nil } func (x *AFTEntry) GetMpls() *gribi_aft.Afts_LabelEntryKey { - if x, ok := x.GetEntry().(*AFTEntry_Mpls); ok { - return x.Mpls + if x != nil { + if x, ok := x.Entry.(*AFTEntry_Mpls); ok { + return x.Mpls + } } return nil } func (x *AFTEntry) GetNextHopGroup() *gribi_aft.Afts_NextHopGroupKey { - if x, ok := x.GetEntry().(*AFTEntry_NextHopGroup); ok { - return x.NextHopGroup + if x != nil { + if x, ok := x.Entry.(*AFTEntry_NextHopGroup); ok { + return x.NextHopGroup + } } return nil } func (x *AFTEntry) GetNextHop() *gribi_aft.Afts_NextHopKey { - if x, ok := x.GetEntry().(*AFTEntry_NextHop); ok { - return x.NextHop + if x != nil { + if x, ok := x.Entry.(*AFTEntry_NextHop); ok { + return x.NextHop + } } return nil } func (x *AFTEntry) GetMacEntry() *gribi_aft.Afts_MacEntryKey { - if x, ok := x.GetEntry().(*AFTEntry_MacEntry); ok { - return x.MacEntry + if x != nil { + if x, ok := x.Entry.(*AFTEntry_MacEntry); ok { + return x.MacEntry + } } return nil } func (x *AFTEntry) GetPolicyForwardingEntry() *gribi_aft.Afts_PolicyForwardingEntryKey { - if x, ok := x.GetEntry().(*AFTEntry_PolicyForwardingEntry); ok { - return x.PolicyForwardingEntry + if x != nil { + if x, ok := x.Entry.(*AFTEntry_PolicyForwardingEntry); ok { + return x.PolicyForwardingEntry + } } return nil } @@ -1845,12 +1866,11 @@ func (*AFTEntry_MacEntry) isAFTEntry_Entry() {} func (*AFTEntry_PolicyForwardingEntry) isAFTEntry_Entry() {} type GetResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A set of entries that are installed on the device. - Entry []*AFTEntry `protobuf:"bytes,1,rep,name=entry,proto3" json:"entry,omitempty"` + Entry []*AFTEntry `protobuf:"bytes,1,rep,name=entry,proto3" json:"entry,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetResponse) Reset() { @@ -1893,10 +1913,7 @@ func (x *GetResponse) GetEntry() []*AFTEntry { // FlushRequest is the request sent from the client to the server when a Flush // RPC is called. type FlushRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // election specifies the election ID from a client. It is valid only // when the server has clients that are operating in the SINGLE_PRIMARY mode. // If the client does not supply one of the messages within election, the @@ -1904,7 +1921,7 @@ type FlushRequest struct { // FAILED_PRECONDITION, and specifying UNSPECIFIED_ELECTION_BEHAVIOR in the // FlushResponseError in the details returned. // - // Types that are assignable to Election: + // Types that are valid to be assigned to Election: // // *FlushRequest_Id // *FlushRequest_Override @@ -1914,11 +1931,13 @@ type FlushRequest struct { // an error specifying the INVALID_ARGUMENT canonical error code, and the // UNSPECIFIED_NETWORK_INSTANCE error code. // - // Types that are assignable to NetworkInstance: + // Types that are valid to be assigned to NetworkInstance: // // *FlushRequest_Name // *FlushRequest_All NetworkInstance isFlushRequest_NetworkInstance `protobuf_oneof:"network_instance"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *FlushRequest) Reset() { @@ -1951,44 +1970,52 @@ func (*FlushRequest) Descriptor() ([]byte, []int) { return file_v1_proto_service_gribi_proto_rawDescGZIP(), []int{13} } -func (m *FlushRequest) GetElection() isFlushRequest_Election { - if m != nil { - return m.Election +func (x *FlushRequest) GetElection() isFlushRequest_Election { + if x != nil { + return x.Election } return nil } func (x *FlushRequest) GetId() *Uint128 { - if x, ok := x.GetElection().(*FlushRequest_Id); ok { - return x.Id + if x != nil { + if x, ok := x.Election.(*FlushRequest_Id); ok { + return x.Id + } } return nil } func (x *FlushRequest) GetOverride() *Empty { - if x, ok := x.GetElection().(*FlushRequest_Override); ok { - return x.Override + if x != nil { + if x, ok := x.Election.(*FlushRequest_Override); ok { + return x.Override + } } return nil } -func (m *FlushRequest) GetNetworkInstance() isFlushRequest_NetworkInstance { - if m != nil { - return m.NetworkInstance +func (x *FlushRequest) GetNetworkInstance() isFlushRequest_NetworkInstance { + if x != nil { + return x.NetworkInstance } return nil } func (x *FlushRequest) GetName() string { - if x, ok := x.GetNetworkInstance().(*FlushRequest_Name); ok { - return x.Name + if x != nil { + if x, ok := x.NetworkInstance.(*FlushRequest_Name); ok { + return x.Name + } } return "" } func (x *FlushRequest) GetAll() *Empty { - if x, ok := x.GetNetworkInstance().(*FlushRequest_All); ok { - return x.All + if x != nil { + if x, ok := x.NetworkInstance.(*FlushRequest_All); ok { + return x.All + } } return nil } @@ -2054,14 +2081,13 @@ func (*FlushRequest_All) isFlushRequest_NetworkInstance() {} // FlushResponse is the response from the server to the client to the Flush RPC. type FlushResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The timestamp at which the Flush operation succeeded and was returned to // the client. It is specified in nanoseconds since the Unix epoch. - Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - Result FlushResponse_Result `protobuf:"varint,2,opt,name=result,proto3,enum=gribi.FlushResponse_Result" json:"result,omitempty"` + Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Result FlushResponse_Result `protobuf:"varint,2,opt,name=result,proto3,enum=gribi.FlushResponse_Result" json:"result,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *FlushResponse) Reset() { @@ -2111,11 +2137,10 @@ func (x *FlushResponse) GetResult() FlushResponse_Result { // FlushResponseError is used in the details of the gRPC status in the case that // the Flush RPC encounters an error. type FlushResponseError struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Status FlushResponseError_Reason `protobuf:"varint,1,opt,name=status,proto3,enum=gribi.FlushResponseError_Reason" json:"status,omitempty"` unknownFields protoimpl.UnknownFields - - Status FlushResponseError_Reason `protobuf:"varint,1,opt,name=status,proto3,enum=gribi.FlushResponseError_Reason" json:"status,omitempty"` + sizeCache protoimpl.SizeCache } func (x *FlushResponseError) Reset() { diff --git a/v1/proto/service/gribi_grpc.pb.go b/v1/proto/service/gribi_grpc.pb.go index 1e998ee..100296b 100644 --- a/v1/proto/service/gribi_grpc.pb.go +++ b/v1/proto/service/gribi_grpc.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: v1/proto/service/gribi.proto package gribi From 564a6a458b17157372d3c7c7cec85e9c27114261 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Wed, 29 Jan 2025 00:14:07 +0000 Subject: [PATCH 4/5] Kept pace with yang model changes in public repository. --- v1/yang/aft/openconfig-aft-types.yang | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/v1/yang/aft/openconfig-aft-types.yang b/v1/yang/aft/openconfig-aft-types.yang index c956608..390fbf4 100644 --- a/v1/yang/aft/openconfig-aft-types.yang +++ b/v1/yang/aft/openconfig-aft-types.yang @@ -16,7 +16,13 @@ module openconfig-aft-types { "Types related to the OpenConfig Abstract Forwarding Table (AFT) model"; - oc-ext:openconfig-version "1.2.0"; + oc-ext:openconfig-version "1.3.0"; + + revision "2025-01-28" { + description + "Deprecated UDP enum and replaced it by more fine-grained enums UDPV4 and UDPV6."; + reference "1.3.0"; + } revision "2024-07-18" { description @@ -97,7 +103,8 @@ module openconfig-aft-types { } enum UDP { description - "The encapsulation header is UDP packet header."; + "DEPRECATED. The encapsulation header is UDP packet header. This node + is deprecated in favor of UDPV4 and UDPV6 nodes."; } enum UDPV4 { description From 513202b510eeb36c383b21633915fd0dc7e6387a Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Tue, 4 Feb 2025 17:23:20 -0800 Subject: [PATCH 5/5] Keep pace with https://github.com/openconfig/public/pull/1248/commits/190e007557a18690240d81045aeb885aa62bb92c --- v1/yang/aft/openconfig-aft-types.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1/yang/aft/openconfig-aft-types.yang b/v1/yang/aft/openconfig-aft-types.yang index 390fbf4..4594d4a 100644 --- a/v1/yang/aft/openconfig-aft-types.yang +++ b/v1/yang/aft/openconfig-aft-types.yang @@ -108,11 +108,11 @@ module openconfig-aft-types { } enum UDPV4 { description - "The encapsulation header is UDPV4 packet header."; + "The encapsulation header is a UDP + IPv4 header."; } enum UDPV6 { description - "The encapsulation header is UDPV6 packet header."; + "The encapsulation header is a UDP + IPv6 header."; } } description