From f2f02971ebdba1cd9e56841237b132713f9b5baa Mon Sep 17 00:00:00 2001 From: Alex Masi Date: Thu, 22 Feb 2024 23:36:46 +0000 Subject: [PATCH] fix tests and fmt --- cloudbuild/vendors/vendors_test.go | 2 +- topo/node/arista/arista.go | 10 +-- topo/node/arista/arista_test.go | 24 ++++--- topo/node/cisco/cisco.go | 6 +- topo/node/cisco/cisco_test.go | 85 +++++++++---------------- topo/node/juniper/juniper.go | 10 +-- topo/node/juniper/juniper_test.go | 64 +++++++++---------- topo/node/nokia/nokia.go | 10 +-- topo/node/nokia/nokia_test.go | 28 +++----- topo/node/openconfig/openconfig.go | 14 ++-- topo/node/openconfig/openconfig_test.go | 81 ++++++++--------------- 11 files changed, 140 insertions(+), 194 deletions(-) diff --git a/cloudbuild/vendors/vendors_test.go b/cloudbuild/vendors/vendors_test.go index e0df9388..8ca42e07 100644 --- a/cloudbuild/vendors/vendors_test.go +++ b/cloudbuild/vendors/vendors_test.go @@ -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" diff --git a/topo/node/arista/arista.go b/topo/node/arista/arista.go index ab644b85..3af6477a 100644 --- a/topo/node/arista/arista.go +++ b/topo/node/arista/arista.go @@ -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, }, } diff --git a/topo/node/arista/arista_test.go b/topo/node/arista/arista_test.go index 7b9fd0d4..3b206597 100644 --- a/topo/node/arista/arista_test.go +++ b/topo/node/arista/arista_test.go @@ -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", @@ -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, + }, }, }, }, diff --git a/topo/node/cisco/cisco.go b/topo/node/cisco/cisco.go index c7d1e0bd..a388c67c 100644 --- a/topo/node/cisco/cisco.go +++ b/topo/node/cisco/cisco.go @@ -397,7 +397,7 @@ 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: { @@ -405,11 +405,11 @@ func defaults(pb *tpb.Node) (*tpb.Node, error) { Inside: 57400, }, 9340: { - Names: []string{"gribi"}, + Names: []string{"gribi"}, Inside: 57400, }, 9559: { - Names: []string{"p4rt"}, + Names: []string{"p4rt"}, Inside: 57400, }, } diff --git a/topo/node/cisco/cisco_test.go b/topo/node/cisco/cisco_test.go index e8fabe12..84fb17ce 100644 --- a/topo/node/cisco/cisco_test.go +++ b/topo/node/cisco/cisco_test.go @@ -39,6 +39,7 @@ import ( func init() { skipValidation = true } + func defaultNode(pb *tpb.Node) *tpb.Node { node, _ := defaults(pb) return node @@ -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, }, }, @@ -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, }, }, @@ -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, }, }, @@ -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, }, }, @@ -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, }, }, @@ -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, }, }, @@ -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, }, }, diff --git a/topo/node/juniper/juniper.go b/topo/node/juniper/juniper.go index cdf9184c..4bfcd3f9 100644 --- a/topo/node/juniper/juniper.go +++ b/topo/node/juniper/juniper.go @@ -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, }, } diff --git a/topo/node/juniper/juniper_test.go b/topo/node/juniper/juniper_test.go index df328840..dec1dd50 100644 --- a/topo/node/juniper/juniper_test.go +++ b/topo/node/juniper/juniper_test.go @@ -445,23 +445,23 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 443: { - Name: "ssl", + Names: []string{"ssl"}, Inside: 443, }, 22: { - Name: "ssh", + Names: []string{"ssh"}, Inside: 22, }, - 9337: { - Name: "gnoi", - Inside: 32767, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 32767, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, + Inside: 32767, + }, + 9559: { + Names: []string{"p4rt"}, Inside: 32767, }, }, @@ -523,23 +523,23 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 443: { - Name: "ssl", + Names: []string{"ssl"}, Inside: 443, }, 22: { - Name: "ssh", + Names: []string{"ssh"}, Inside: 22, }, - 9337: { - Name: "gnoi", - Inside: 32767, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 32767, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, + Inside: 32767, + }, + 9559: { + Names: []string{"p4rt"}, Inside: 32767, }, }, @@ -601,23 +601,23 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 443: { - Name: "ssl", + Names: []string{"ssl"}, Inside: 443, }, 22: { - Name: "ssh", + Names: []string{"ssh"}, Inside: 22, }, - 9337: { - Name: "gnoi", - Inside: 32767, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 32767, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, + Inside: 32767, + }, + 9559: { + Names: []string{"p4rt"}, Inside: 32767, }, }, @@ -668,23 +668,23 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 443: { - Name: "ssl", + Names: []string{"ssl"}, Inside: 443, }, 22: { - Name: "ssh", + Names: []string{"ssh"}, Inside: 22, }, - 9337: { - Name: "gnoi", - Inside: 32767, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 32767, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, + Inside: 32767, + }, + 9559: { + Names: []string{"p4rt"}, Inside: 32767, }, }, diff --git a/topo/node/nokia/nokia.go b/topo/node/nokia/nokia.go index 6363a249..792a0453 100644 --- a/topo/node/nokia/nokia.go +++ b/topo/node/nokia/nokia.go @@ -331,23 +331,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: 57400, }, 9340: { - Names: []string{"gribi"}, + Names: []string{"gribi"}, Inside: 57401, }, 9559: { - Names: []string{"p4rt"}, + Names: []string{"p4rt"}, Inside: 9559, }, } diff --git a/topo/node/nokia/nokia_test.go b/topo/node/nokia/nokia_test.go index f381a26a..2800bce1 100644 --- a/topo/node/nokia/nokia_test.go +++ b/topo/node/nokia/nokia_test.go @@ -120,27 +120,23 @@ 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, }, - 9337: { - Name: "gnoi", - Inside: 57400, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 57400, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, Inside: 57401, }, 9559: { - Name: "p4rt", + Names: []string{"p4rt"}, Inside: 9559, }, }, @@ -177,27 +173,23 @@ 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, }, - 9337: { - Name: "gnoi", - Inside: 57400, - }, 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 57400, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, Inside: 57401, }, 9559: { - Name: "p4rt", + Names: []string{"p4rt"}, Inside: 9559, }, }, diff --git a/topo/node/openconfig/openconfig.go b/topo/node/openconfig/openconfig.go index 083050aa..554aad04 100644 --- a/topo/node/openconfig/openconfig.go +++ b/topo/node/openconfig/openconfig.go @@ -267,11 +267,11 @@ func lemmingDefaults(pb *tpb.Node) *tpb.Node { pb.Services = map[uint32]*tpb.Service{ // https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=gnmi 9339: { - Names: []string{"gnmi", "gnoi", "gnsi"}, + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 9339, }, 9340: { - Names: []string{"gribi"}, + Names: []string{"gribi"}, Inside: 9340, }, } @@ -308,17 +308,15 @@ func magnaDefaults(pb *tpb.Node) *tpb.Node { if _, ok := pb.Services[40051]; !ok { pb.Services[40051] = &tpb.Service{ - Name: "grpc", - Inside: 40051, - Outside: 40051, + Names: []string{"grpc"}, + Inside: 40051, } } if _, ok := pb.Services[50051]; !ok { pb.Services[50051] = &tpb.Service{ - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, } } diff --git a/topo/node/openconfig/openconfig_test.go b/topo/node/openconfig/openconfig_test.go index 9e043722..a016c9c1 100644 --- a/topo/node/openconfig/openconfig_test.go +++ b/topo/node/openconfig/openconfig_test.go @@ -331,21 +331,13 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 9339: { - Name: "gnmi", + Names: []string{"gnmi", "gnoi", "gnsi"}, Inside: 9339, }, 9340: { - Name: "gribi", + Names: []string{"gribi"}, Inside: 9340, }, - 9341: { - Name: "gnsi", - Inside: 9339, - }, - 9342: { - Name: "gnoi", - Inside: 9339, - }, }, }, }, { @@ -431,14 +423,12 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 40051: { - Name: "grpc", - Inside: 40051, - Outside: 40051, + Names: []string{"grpc"}, + Inside: 40051, }, 50051: { - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, }, }, }, @@ -452,11 +442,8 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 22: { - Name: "ssh", - Inside: 22, - Outside: 22, - InsideIp: "1.1.1.1", - OutsideIp: "10.10.10.10", + Names: []string{"ssh"}, + Inside: 22, }, }, }, @@ -474,21 +461,16 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 22: { - Name: "ssh", - Inside: 22, - Outside: 22, - InsideIp: "1.1.1.1", - OutsideIp: "10.10.10.10", + Names: []string{"ssh"}, + Inside: 22, }, 40051: { - Name: "grpc", - Inside: 40051, - Outside: 40051, + Names: []string{"grpc"}, + Inside: 40051, }, 50051: { - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, }, }, }, @@ -515,14 +497,12 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 40051: { - Name: "grpc", - Inside: 40051, - Outside: 40051, + Names: []string{"grpc"}, + Inside: 40051, }, 50051: { - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, }, }, }, @@ -536,9 +516,8 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 40051: { - Name: "foobar", - Inside: 40051, - Outside: 40051, + Names: []string{"foobar"}, + Inside: 40051, }, }, }, @@ -556,14 +535,12 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 40051: { - Name: "foobar", - Inside: 40051, - Outside: 40051, + Names: []string{"foobar"}, + Inside: 40051, }, 50051: { - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, }, }, }, @@ -589,14 +566,12 @@ func TestNew(t *testing.T) { }, Services: map[uint32]*tpb.Service{ 40051: { - Name: "grpc", - Inside: 40051, - Outside: 40051, + Names: []string{"grpc"}, + Inside: 40051, }, 50051: { - Name: "gnmi", - Inside: 50051, - Outside: 50051, + Names: []string{"gnmi"}, + Inside: 50051, }, }, Labels: map[string]string{