From f2c7f838bec0cc3c7b3a9d6eb3b1a6a57be1e315 Mon Sep 17 00:00:00 2001 From: basavarajnokia Date: Mon, 29 Jul 2024 16:49:59 +0530 Subject: [PATCH 1/3] - Corrected TestGNMISampleMode as per README - Added Deviation - Fixed testbed association in metadata.textproto "This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia\u2019s intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind." --- .../gnmi_sample_mode_test.go | 15 +++------------ .../gnmi_sample_mode_test/metadata.textproto | 10 +++++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go index 1b31e0a73d4..e7f72c9e4ea 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go @@ -35,24 +35,14 @@ func TestGNMISampleMode(t *testing.T) { p1Stream := samplestream.New(t, dut, gnmi.OC().Interface(p1.Name()).Description().State(), 10*time.Second) defer p1Stream.Close() - desc := p1Stream.Next() - if desc == nil { - t.Errorf("Interface %q telemetry not received before config", p1.Name()) - } else { - v, ok := desc.Val() - if !ok { - t.Errorf("Interface %q telemetry empty before config", p1.Name()) - } - t.Logf("Description before config: %s", v) - } - gnmi.Replace(t, dut, gnmi.OC().Interface(p1.Name()).Config(), dutPort1.NewOCInterface(p1.Name(), dut)) - desc = p1Stream.Next() + desc := p1Stream.Next() if desc == nil { t.Errorf("Interface %q telemetry not received after config", p1.Name()) } else { v, ok := desc.Val() + t.Logf("Description from stream : %s", v) if !ok { t.Errorf("Interface %q telemetry empty after config", p1.Name()) } @@ -69,6 +59,7 @@ func TestGNMISampleMode(t *testing.T) { t.Errorf("Interface %q telemetry not received after description update", p1.Name()) } else { v, ok := desc.Val() + t.Logf("Description from stream : %s", v) if !ok { t.Errorf("Interface %q telemetry empty after description update", p1.Name()) } diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto index 87d02fedf47..9f4c6a67ba7 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto @@ -4,7 +4,7 @@ uuid: "abcc6890-c3e1-4b0e-984e-749c85b54e5a" plan_id: "gNMI-1.27" description: "gNMI Sample Mode Test" -testbed: TESTBED_DUT +testbed: TESTBED_DUT_ATE_2LINKS platform_exceptions: { platform: { vendor: ARISTA @@ -18,3 +18,11 @@ platform_exceptions: { isis_interface_afi_unsupported: true } } +platform_exceptions: { + platform: { + vendor: NOKIA + } + deviations: { + explicit_interface_in_default_vrf: true + } +} From b73a94e3e3c09331c7a81931be123c40c170f596 Mon Sep 17 00:00:00 2001 From: basavarajnokia Date: Thu, 1 Aug 2024 11:48:07 +0530 Subject: [PATCH 2/3] - "gNMI-1.27" - Changed to Logf before config - Added Deviation - Fixed testbed association in metadata.textproto - Updated README with OC paths "This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia\u2019s intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind." --- .../subscribe/tests/gnmi_sample_mode_test/README.md | 7 ++++++- .../gnmi_sample_mode_test/gnmi_sample_mode_test.go | 6 ++++-- .../tests/gnmi_sample_mode_test/metadata.textproto | 10 +++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/README.md b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/README.md index efeacde8591..cc08bec8a9b 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/README.md +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/README.md @@ -44,10 +44,15 @@ Test to validate basic gNMI streaming telemetry works with `SAMPLE` mode. The below yaml defines the OC paths intended to be covered by this test. OC paths used for test setup are not listed here. -TODO(OCPATHS): Add paths ```yaml + paths: +## Config Paths ## +/interfaces/interface/config/description: + +## State Paths ## +/interfaces/interface/state/description: rpcs: gnmi: diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go index 1b31e0a73d4..049e80d0162 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go @@ -37,11 +37,11 @@ func TestGNMISampleMode(t *testing.T) { desc := p1Stream.Next() if desc == nil { - t.Errorf("Interface %q telemetry not received before config", p1.Name()) + t.Logf("Interface %q telemetry not received before config", p1.Name()) } else { v, ok := desc.Val() if !ok { - t.Errorf("Interface %q telemetry empty before config", p1.Name()) + t.Logf("Interface %q telemetry empty before config", p1.Name()) } t.Logf("Description before config: %s", v) } @@ -53,6 +53,7 @@ func TestGNMISampleMode(t *testing.T) { t.Errorf("Interface %q telemetry not received after config", p1.Name()) } else { v, ok := desc.Val() + t.Logf("Description from stream : %s", v) if !ok { t.Errorf("Interface %q telemetry empty after config", p1.Name()) } @@ -69,6 +70,7 @@ func TestGNMISampleMode(t *testing.T) { t.Errorf("Interface %q telemetry not received after description update", p1.Name()) } else { v, ok := desc.Val() + t.Logf("Description from stream : %s", v) if !ok { t.Errorf("Interface %q telemetry empty after description update", p1.Name()) } diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto index 87d02fedf47..9f4c6a67ba7 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto @@ -4,7 +4,7 @@ uuid: "abcc6890-c3e1-4b0e-984e-749c85b54e5a" plan_id: "gNMI-1.27" description: "gNMI Sample Mode Test" -testbed: TESTBED_DUT +testbed: TESTBED_DUT_ATE_2LINKS platform_exceptions: { platform: { vendor: ARISTA @@ -18,3 +18,11 @@ platform_exceptions: { isis_interface_afi_unsupported: true } } +platform_exceptions: { + platform: { + vendor: NOKIA + } + deviations: { + explicit_interface_in_default_vrf: true + } +} From 87d7bbeccda67de77b661cddac0f393126356782 Mon Sep 17 00:00:00 2001 From: basavarajnokia Date: Thu, 8 Aug 2024 11:12:57 +0530 Subject: [PATCH 3/3] Removed lines 38-47 as per comment from Sergey Fomin as it is a no-op. --- .../gnmi_sample_mode_test/gnmi_sample_mode_test.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go index 049e80d0162..e7f72c9e4ea 100644 --- a/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go +++ b/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/gnmi_sample_mode_test.go @@ -35,20 +35,9 @@ func TestGNMISampleMode(t *testing.T) { p1Stream := samplestream.New(t, dut, gnmi.OC().Interface(p1.Name()).Description().State(), 10*time.Second) defer p1Stream.Close() - desc := p1Stream.Next() - if desc == nil { - t.Logf("Interface %q telemetry not received before config", p1.Name()) - } else { - v, ok := desc.Val() - if !ok { - t.Logf("Interface %q telemetry empty before config", p1.Name()) - } - t.Logf("Description before config: %s", v) - } - gnmi.Replace(t, dut, gnmi.OC().Interface(p1.Name()).Config(), dutPort1.NewOCInterface(p1.Name(), dut)) - desc = p1Stream.Next() + desc := p1Stream.Next() if desc == nil { t.Errorf("Interface %q telemetry not received after config", p1.Name()) } else {