Skip to content

Commit

Permalink
Use standard protobuf library naming for gribi_aft. (#930)
Browse files Browse the repository at this point in the history 
* (M) protomap/integration_tests/integration_test.go
  - Rename `gribi_aft` to `aftpb` to reflect standard protobuf library
    naming.
  • Loading branch information
@robshakir
robshakir committed Nov 7, 2023
1 parent 2fe7c7f commit efd1f1d
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions protomap/integration_tests/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/openconfig/gnmi/value"
"github.com/openconfig/ygot/protomap"
"github.com/openconfig/ygot/protomap/integration_tests/testdata/gribi_aft"
"github.com/openconfig/ygot/testutil"
"github.com/openconfig/ygot/ygot"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/testing/protocmp"

gpb "github.com/openconfig/gnmi/proto/gnmi"
wpb "github.com/openconfig/ygot/proto/ywrapper"
aftpb "github.com/openconfig/ygot/protomap/integration_tests/testdata/gribi_aft"
)

func mustPath(p string) *gpb.Path {
Expand All @@ -34,10 +34,10 @@ func TestGRIBIAFT(t *testing.T) {
wantErr bool
}{{
desc: "IPv4 Entry with key",
inProto: &gribi_aft.Afts{
Ipv4Entry: []*gribi_aft.Afts_Ipv4EntryKey{{
inProto: &aftpb.Afts{
Ipv4Entry: []*aftpb.Afts_Ipv4EntryKey{{
Prefix: "1.0.0.0/24",
Ipv4Entry: &gribi_aft.Afts_Ipv4Entry{},
Ipv4Entry: &aftpb.Afts_Ipv4Entry{},
}},
},
wantPaths: map[*gpb.Path]interface{}{
Expand All @@ -46,26 +46,26 @@ func TestGRIBIAFT(t *testing.T) {
},
}, {
desc: "IPv4 Entry with nil prefix",
inProto: &gribi_aft.Afts{
Ipv4Entry: []*gribi_aft.Afts_Ipv4EntryKey{{}},
inProto: &aftpb.Afts{
Ipv4Entry: []*aftpb.Afts_Ipv4EntryKey{{}},
},
wantErr: true,
}, {
desc: "IPv4 Entry with nil list member",
inProto: &gribi_aft.Afts{
Ipv4Entry: []*gribi_aft.Afts_Ipv4EntryKey{{
inProto: &aftpb.Afts{
Ipv4Entry: []*aftpb.Afts_Ipv4EntryKey{{
Prefix: "2.2.2.2/32",
}},
},
wantErr: true,
}, {
desc: "MPLS label entry - oneof key",
inProto: &gribi_aft.Afts{
LabelEntry: []*gribi_aft.Afts_LabelEntryKey{{
Label: &gribi_aft.Afts_LabelEntryKey_LabelUint64{
inProto: &aftpb.Afts{
LabelEntry: []*aftpb.Afts_LabelEntryKey{{
Label: &aftpb.Afts_LabelEntryKey_LabelUint64{
LabelUint64: 32,
},
LabelEntry: &gribi_aft.Afts_LabelEntry{},
LabelEntry: &aftpb.Afts_LabelEntry{},
}},
},
wantPaths: map[*gpb.Path]interface{}{
Expand All @@ -74,11 +74,11 @@ func TestGRIBIAFT(t *testing.T) {
},
}, {
desc: "NH entry with label stack",
inProto: &gribi_aft.Afts{
NextHop: []*gribi_aft.Afts_NextHopKey{{
inProto: &aftpb.Afts{
NextHop: []*aftpb.Afts_NextHopKey{{
Index: 1,
NextHop: &gribi_aft.Afts_NextHop{
PushedMplsLabelStack: []*gribi_aft.Afts_NextHop_PushedMplsLabelStackUnion{{
NextHop: &aftpb.Afts_NextHop{
PushedMplsLabelStack: []*aftpb.Afts_NextHop_PushedMplsLabelStackUnion{{
PushedMplsLabelStackUint64: 42,
}, {
PushedMplsLabelStackUint64: 84,
Expand All @@ -93,13 +93,13 @@ func TestGRIBIAFT(t *testing.T) {
},
}, {
desc: "NHG entry",
inProto: &gribi_aft.Afts{
NextHopGroup: []*gribi_aft.Afts_NextHopGroupKey{{
inProto: &aftpb.Afts{
NextHopGroup: []*aftpb.Afts_NextHopGroupKey{{
Id: 1,
NextHopGroup: &gribi_aft.Afts_NextHopGroup{
NextHop: []*gribi_aft.Afts_NextHopGroup_NextHopKey{{
NextHopGroup: &aftpb.Afts_NextHopGroup{
NextHop: []*aftpb.Afts_NextHopGroup_NextHopKey{{
Index: 1,
NextHop: &gribi_aft.Afts_NextHopGroup_NextHop{
NextHop: &aftpb.Afts_NextHopGroup_NextHop{
Weight: &wpb.UintValue{Value: 1},
},
}},
Expand Down Expand Up @@ -149,9 +149,9 @@ func TestGRIBIAFTToStruct(t *testing.T) {
inPaths: map[*gpb.Path]interface{}{
mustPath("state/entry-metadata"): mustValue(t, []byte{1, 2, 3}),
},
inProto: &gribi_aft.Afts_Ipv4Entry{},
inProto: &aftpb.Afts_Ipv4Entry{},
inPrefix: mustPath("afts/ipv4-unicast/ipv4-entry"),
wantProto: &gribi_aft.Afts_Ipv4Entry{
wantProto: &aftpb.Afts_Ipv4Entry{
EntryMetadata: &wpb.BytesValue{Value: []byte{1, 2, 3}},
},
}, {
Expand All @@ -161,7 +161,7 @@ func TestGRIBIAFTToStruct(t *testing.T) {
mustPath("next-hops/next-hop[index=1]/state/index"): mustValue(t, uint64(1)),
mustPath("next-hops/next-hop[index=1]/state/weight"): mustValue(t, uint64(1)),
},
inProto: &gribi_aft.Afts_NextHopGroup{},
inProto: &aftpb.Afts_NextHopGroup{},
inPrefix: &gpb.Path{
Elem: []*gpb.PathElem{{
Name: "afts",
Expand All @@ -171,10 +171,10 @@ func TestGRIBIAFTToStruct(t *testing.T) {
Name: "next-hop-group",
}},
},
wantProto: &gribi_aft.Afts_NextHopGroup{
NextHop: []*gribi_aft.Afts_NextHopGroup_NextHopKey{{
wantProto: &aftpb.Afts_NextHopGroup{
NextHop: []*aftpb.Afts_NextHopGroup_NextHopKey{{
Index: 1,
NextHop: &gribi_aft.Afts_NextHopGroup_NextHop{
NextHop: &aftpb.Afts_NextHopGroup_NextHop{
Weight: &wpb.UintValue{Value: 1},
},
}},
Expand All @@ -189,7 +189,7 @@ func TestGRIBIAFTToStruct(t *testing.T) {
mustPath("next-hops/next-hop[index=2]/state/index"): mustValue(t, uint64(2)),
mustPath("next-hops/next-hop[index=2]/state/weight"): mustValue(t, uint64(2)),
},
inProto: &gribi_aft.Afts_NextHopGroup{},
inProto: &aftpb.Afts_NextHopGroup{},
inPrefix: &gpb.Path{
Elem: []*gpb.PathElem{{
Name: "afts",
Expand All @@ -199,15 +199,15 @@ func TestGRIBIAFTToStruct(t *testing.T) {
Name: "next-hop-group",
}},
},
wantProto: &gribi_aft.Afts_NextHopGroup{
NextHop: []*gribi_aft.Afts_NextHopGroup_NextHopKey{{
wantProto: &aftpb.Afts_NextHopGroup{
NextHop: []*aftpb.Afts_NextHopGroup_NextHopKey{{
Index: 1,
NextHop: &gribi_aft.Afts_NextHopGroup_NextHop{
NextHop: &aftpb.Afts_NextHopGroup_NextHop{
Weight: &wpb.UintValue{Value: 1},
},
}, {
Index: 2,
NextHop: &gribi_aft.Afts_NextHopGroup_NextHop{
NextHop: &aftpb.Afts_NextHopGroup_NextHop{
Weight: &wpb.UintValue{Value: 2},
},
}},
Expand All @@ -217,10 +217,10 @@ func TestGRIBIAFTToStruct(t *testing.T) {
inPaths: map[*gpb.Path]interface{}{
mustPath("ip-in-ip/state/src-ip"): mustValue(t, "1.1.1.1"),
},
inProto: &gribi_aft.Afts_NextHop{},
inProto: &aftpb.Afts_NextHop{},
inPrefix: mustPath("afts/next-hops/next-hop"),
wantProto: &gribi_aft.Afts_NextHop{
IpInIp: &gribi_aft.Afts_NextHop_IpInIp{
wantProto: &aftpb.Afts_NextHop{
IpInIp: &aftpb.Afts_NextHop_IpInIp{
SrcIp: &wpb.StringValue{Value: "1.1.1.1"},
},
},
Expand All @@ -240,10 +240,10 @@ func TestGRIBIAFTToStruct(t *testing.T) {
},
},
},
inProto: &gribi_aft.Afts_NextHop{},
inProto: &aftpb.Afts_NextHop{},
inPrefix: mustPath("afts/next-hops/next-hop"),
wantProto: &gribi_aft.Afts_NextHop{
PushedMplsLabelStack: []*gribi_aft.Afts_NextHop_PushedMplsLabelStackUnion{{
wantProto: &aftpb.Afts_NextHop{
PushedMplsLabelStack: []*aftpb.Afts_NextHop_PushedMplsLabelStackUnion{{
PushedMplsLabelStackUint64: 20,
}, {
PushedMplsLabelStackUint64: 30,
Expand All @@ -269,7 +269,7 @@ func TestGRIBIAFTToStruct(t *testing.T) {

if diff := cmp.Diff(tt.inProto, tt.wantProto,
protocmp.Transform(),
protocmp.SortRepeatedFields(&gribi_aft.Afts_NextHopGroup{}, "next_hop"),
protocmp.SortRepeatedFields(&aftpb.Afts_NextHopGroup{}, "next_hop"),
); diff != "" {
t.Fatalf("did not get expected protobuf, diff(-got,+want):\n%s", diff)
}
Expand Down

0 comments on commit efd1f1d

Please sign in to comment.