Skip to content

Commit

Permalink
fix tests and fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexmasi
alexmasi committed Feb 22, 2024
1 parent 3cd23ad commit f2f0297
Show file tree
Hide file tree
Showing 11 changed files with 140 additions and 194 deletions.
2 changes: 1 addition & 1 deletion cloudbuild/vendors/vendors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/open-traffic-generator/snappi/gosnappi"
"github.com/openconfig/gnoigo/system"
pathzpb "github.com/openconfig/gnsi/pathz"
gribipb "github.com/openconfig/gribi/v1/proto/service"
"github.com/openconfig/ondatra"
"github.com/openconfig/ondatra/gnmi"
pathzpb "github.com/openconfig/gnsi/pathz"
"github.com/openconfig/ondatra/gnoi"
kinit "github.com/openconfig/ondatra/knebind/init"
p4pb "github.com/p4lang/p4runtime/go/p4/v1"
Expand Down
10 changes: 5 additions & 5 deletions topo/node/arista/arista.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,23 +342,23 @@ func defaults(pb *tpb.Node) *tpb.Node {
if pb.Services == nil {
pb.Services = map[uint32]*tpb.Service{
443: {
Names: []string{"ssl"},
Names: []string{"ssl"},
Inside: 443,
},
22: {
Names: []string{"ssh"},
Names: []string{"ssh"},
Inside: 22,
},
6030: {
Names: []string{"gnmi", "gnoi"},
Names: []string{"gnmi", "gnoi"},
Inside: 6030,
},
9340: {
Names: []string{"gribi"},
Names: []string{"gribi"},
Inside: 9340,
},
9559: {
Names: []string{"p4rt"},
Names: []string{"p4rt"},
Inside: 9559,
},
}
Expand Down
24 changes: 16 additions & 8 deletions topo/node/arista/arista_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,21 +152,25 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*topopb.Service{
443: {
Name: "ssl",
Names: []string{"ssl"},
Inside: 443,
},
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
6030: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi"},
Inside: 6030,
},
9340: {
Name: "gribi",
Names: []string{"gribi"},
Inside: 9340,
},
9559: {
Names: []string{"p4rt"},
Inside: 9559,
},
},
Model: "ceos",
Os: "eos",
Expand Down Expand Up @@ -236,21 +240,25 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*topopb.Service{
443: {
Name: "ssl",
Names: []string{"ssl"},
Inside: 443,
},
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
6030: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi"},
Inside: 6030,
},
9340: {
Name: "gribi",
Names: []string{"gribi"},
Inside: 9340,
},
9559: {
Names: []string{"p4rt"},
Inside: 9559,
},
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions topo/node/cisco/cisco.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,19 +397,19 @@ func defaults(pb *tpb.Node) (*tpb.Node, error) {
if pb.Services == nil {
pb.Services = map[uint32]*tpb.Service{
22: {
Names: []string{"ssh"},
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Names: []string{"gribi"},
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Names: []string{"p4rt"},
Names: []string{"p4rt"},
Inside: 57400,
},
}
Expand Down
85 changes: 29 additions & 56 deletions topo/node/cisco/cisco_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
func init() {
skipValidation = true
}

func defaultNode(pb *tpb.Node) *tpb.Node {
node, _ := defaults(pb)
return node
Expand Down Expand Up @@ -113,23 +114,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -214,23 +211,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -319,23 +312,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -443,23 +432,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -574,23 +559,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -675,23 +656,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down Expand Up @@ -806,23 +783,19 @@ func TestNew(t *testing.T) {
},
Services: map[uint32]*tpb.Service{
22: {
Name: "ssh",
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Name: "gnmi",
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 57400,
},
9340: {
Name: "gribi",
Inside: 57400,
},
9337: {
Name: "gnoi",
Names: []string{"gribi"},
Inside: 57400,
},
9559: {
Name: "p4rt",
Names: []string{"p4rt"},
Inside: 57400,
},
},
Expand Down
10 changes: 5 additions & 5 deletions topo/node/juniper/juniper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,23 +578,23 @@ func defaults(pb *tpb.Node) *tpb.Node {
if pb.Services == nil {
pb.Services = map[uint32]*tpb.Service{
443: {
Names: []string{"ssl"},
Names: []string{"ssl"},
Inside: 443,
},
22: {
Names: []string{"ssh"},
Names: []string{"ssh"},
Inside: 22,
},
9339: {
Names: []string{"gnmi", "gnoi", "gnsi"},
Names: []string{"gnmi", "gnoi", "gnsi"},
Inside: 32767,
},
9340: {
Names: []string{"gribi"},
Names: []string{"gribi"},
Inside: 32767,
},
9559: {
Names: []string{"p4rt"},
Names: []string{"p4rt"},
Inside: 32767,
},
}
Expand Down
Loading

0 comments on commit f2f0297

Please sign in to comment.