From 520bae4cb3cc6539343443f167a55c6136f9685a Mon Sep 17 00:00:00 2001 From: Greg Dennis <5436032+greg-dennis@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:44:44 -0400 Subject: [PATCH] Replace binding.GNOIClients with gnoigo.Clients (#2291) --- .../route_addition_during_failover_test.go | 4 ++-- .../route_removal_during_failover_test.go | 4 ++-- .../system_generic_health_check_test.go | 4 ++-- .../packet_link_qualification_test.go | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/feature/experimental/gribi/otg_tests/route_addition_during_failover_test/route_addition_during_failover_test.go b/feature/experimental/gribi/otg_tests/route_addition_during_failover_test/route_addition_during_failover_test.go index 66b7d054625..8f4fe0a0aff 100644 --- a/feature/experimental/gribi/otg_tests/route_addition_during_failover_test/route_addition_during_failover_test.go +++ b/feature/experimental/gribi/otg_tests/route_addition_during_failover_test/route_addition_during_failover_test.go @@ -32,12 +32,12 @@ import ( "github.com/openconfig/featureprofiles/internal/fptest" "github.com/openconfig/featureprofiles/internal/gribi" "github.com/openconfig/featureprofiles/internal/otgutils" + "github.com/openconfig/gnoigo" "github.com/openconfig/gnoigo/system" "github.com/openconfig/gribigo/chk" "github.com/openconfig/gribigo/constants" "github.com/openconfig/gribigo/fluent" "github.com/openconfig/ondatra" - "github.com/openconfig/ondatra/binding" "github.com/openconfig/ondatra/gnmi" "github.com/openconfig/ondatra/gnmi/oc" "github.com/openconfig/ondatra/gnoi" @@ -126,7 +126,7 @@ var ipBlock1FlowArgs = &flowArgs{ } // coreFileCheck function is used to check if cores are found on the DUT. -func coreFileCheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient binding.GNOIClients, sysConfigTime uint64, retry bool) { +func coreFileCheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient gnoigo.Clients, sysConfigTime uint64, retry bool) { t.Helper() t.Log("Checking for core files on DUT") diff --git a/feature/experimental/gribi/otg_tests/route_removal_during_failover_test/route_removal_during_failover_test.go b/feature/experimental/gribi/otg_tests/route_removal_during_failover_test/route_removal_during_failover_test.go index 70829940afb..ee9874f4844 100644 --- a/feature/experimental/gribi/otg_tests/route_removal_during_failover_test/route_removal_during_failover_test.go +++ b/feature/experimental/gribi/otg_tests/route_removal_during_failover_test/route_removal_during_failover_test.go @@ -32,13 +32,13 @@ import ( "github.com/openconfig/featureprofiles/internal/fptest" "github.com/openconfig/featureprofiles/internal/gribi" "github.com/openconfig/featureprofiles/internal/otgutils" + "github.com/openconfig/gnoigo" "github.com/openconfig/gnoigo/system" gpb "github.com/openconfig/gribi/v1/proto/service" "github.com/openconfig/gribigo/chk" "github.com/openconfig/gribigo/constants" "github.com/openconfig/gribigo/fluent" "github.com/openconfig/ondatra" - "github.com/openconfig/ondatra/binding" "github.com/openconfig/ondatra/gnmi" "github.com/openconfig/ondatra/gnmi/oc" "github.com/openconfig/ondatra/gnoi" @@ -105,7 +105,7 @@ var ( ) // coreFileCheck function is used to check if any cores found during test execution. -func coreFilecheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient binding.GNOIClients, sysConfigTime uint64) { +func coreFilecheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient gnoigo.Clients, sysConfigTime uint64) { // vendorCoreFilePath and vendorCoreProcName should be provided to fetch core file on dut. if _, ok := vendorCoreFilePath[dut.Vendor()]; !ok { t.Fatalf("Please add support for vendor %v in var vendorCoreFilePath ", dut.Vendor()) diff --git a/feature/experimental/system/health/tests/system_generic_health_check/system_generic_health_check_test.go b/feature/experimental/system/health/tests/system_generic_health_check/system_generic_health_check_test.go index f38ddec870f..ee962069738 100644 --- a/feature/experimental/system/health/tests/system_generic_health_check/system_generic_health_check_test.go +++ b/feature/experimental/system/health/tests/system_generic_health_check/system_generic_health_check_test.go @@ -24,8 +24,8 @@ import ( "github.com/openconfig/featureprofiles/internal/components" "github.com/openconfig/featureprofiles/internal/deviations" "github.com/openconfig/featureprofiles/internal/fptest" + "github.com/openconfig/gnoigo" "github.com/openconfig/ondatra" - "github.com/openconfig/ondatra/binding" "github.com/openconfig/ondatra/gnmi" "github.com/openconfig/ondatra/gnmi/oc" "github.com/openconfig/ygnmi/ygnmi" @@ -63,7 +63,7 @@ const ( ) // coreFileCheck function is used to check if cores are found on the DUT. -func coreFileCheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient binding.GNOIClients, sysConfigTime uint64, retry bool) { +func coreFileCheck(t *testing.T, dut *ondatra.DUTDevice, gnoiClient gnoigo.Clients, sysConfigTime uint64, retry bool) { t.Helper() t.Log("Checking for core files on DUT") diff --git a/feature/gnoi/packet_link_qualification/tests/packet_link_qualification_test/packet_link_qualification_test.go b/feature/gnoi/packet_link_qualification/tests/packet_link_qualification_test/packet_link_qualification_test.go index 2ef4d776185..8898974cb75 100644 --- a/feature/gnoi/packet_link_qualification/tests/packet_link_qualification_test/packet_link_qualification_test.go +++ b/feature/gnoi/packet_link_qualification/tests/packet_link_qualification_test/packet_link_qualification_test.go @@ -23,8 +23,8 @@ import ( "github.com/openconfig/featureprofiles/internal/deviations" "github.com/openconfig/featureprofiles/internal/fptest" plqpb "github.com/openconfig/gnoi/packet_link_qualification" + "github.com/openconfig/gnoigo" "github.com/openconfig/ondatra" - "github.com/openconfig/ondatra/binding" "github.com/openconfig/ondatra/gnmi" "github.com/openconfig/ondatra/gnmi/oc" "github.com/openconfig/ygot/ygot" @@ -159,7 +159,7 @@ func TestListDelete(t *testing.T) { gnoiClient1 := dut1.RawAPIs().GNOI(t) gnoiClient2 := dut2.RawAPIs().GNOI(t) - clients := []binding.GNOIClients{gnoiClient1, gnoiClient2} + clients := []gnoigo.Clients{gnoiClient1, gnoiClient2} for i, client := range clients { t.Logf("Check client: %d", i+1) listResp, err := client.LinkQualification().List(context.Background(), &plqpb.ListRequest{}) @@ -337,7 +337,7 @@ func TestLinkQualification(t *testing.T) { t.Logf("Wait for %v seconds: %d/%d", sleepTime.Seconds(), i+1, counter) time.Sleep(sleepTime) testDone := true - for i, client := range []binding.GNOIClients{gnoiClient1, gnoiClient2} { + for i, client := range []gnoigo.Clients{gnoiClient1, gnoiClient2} { t.Logf("Check client: %d", i+1) listResp, err := client.LinkQualification().List(context.Background(), &plqpb.ListRequest{}) @@ -367,7 +367,7 @@ func TestLinkQualification(t *testing.T) { var generatorPktsSent, generatorPktsRxed, reflectorPktsSent, reflectorPktsRxed uint64 - for i, client := range []binding.GNOIClients{gnoiClient1, gnoiClient2} { + for i, client := range []gnoigo.Clients{gnoiClient1, gnoiClient2} { t.Logf("Check client: %d", i+1) getResp, err := client.LinkQualification().Get(context.Background(), getRequest) t.Logf("LinkQualification().Get(): %v, err: %v", getResp, err)