RT-1.27: fixed failed tests #3613

singh-prem · 2024-11-29T11:30:48Z

This PR contains following:

Changed bgp protocol instance name to default as table connection does not have a mechanism to pick a particular bgp instance.
added sortDevicesByName function to sort emulated devices such that correct bgp neighbor gets emulated on correct otg port.
Changed GetAll to LookupAll for prefixes learnt on OTG such that test does not fail fatally for cases where prefixes are not meant to be sent to otg.
Added deviations and methods to configure default-reject route-policy, metric, attribute and skip subscription for table connection.

OpenConfigBot · 2024-11-29T11:31:08Z

Pull Request Functional Test Report for #3613 / `9f18c0d`

Virtual Devices

Device	Test	Test Documentation	Job	Raw Log
Arista cEOS		RT-1.27: Static route to BGP redistribution
Cisco 8000E		RT-1.27: Static route to BGP redistribution
Cisco XRd		RT-1.27: Static route to BGP redistribution
Juniper ncPTX		RT-1.27: Static route to BGP redistribution
Nokia SR Linux		RT-1.27: Static route to BGP redistribution
Openconfig Lemming		RT-1.27: Static route to BGP redistribution

Hardware Devices

Device	Test	Test Documentation	Raw Log
Arista 7808		RT-1.27: Static route to BGP redistribution
Cisco 8808		RT-1.27: Static route to BGP redistribution
Juniper PTX10008		RT-1.27: Static route to BGP redistribution
Nokia 7250 IXR-10e		RT-1.27: Static route to BGP redistribution

Help

LimeHat · 2024-12-03T00:48:33Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -221,7 +224,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice) {
 	t.Helper()

 	dutOcRoot := &oc.Root{}
-	bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "default")


imo this should be a map[string]string variable lookup to enable per-vendor naming schema.

or a deviation-based lookup, similar to how the "static" protocol is currently defined (static_protocol_name).

cc @dplore

This reference to default network instance should be implemented using deviations.DefaultNetworkInstance()

Hi @dplore , just to be sure, are you suggesting the code to change like this :
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.DefaultNetworkInstance(dut))

@dplore

This reference to default network instance should be implemented using deviations.DefaultNetworkInstance()

I think this change is about the BGP protocol instance naming (seems that some implementations use BGP, while other require the name default)

Oh, I see, the current code is already using deviations.DefaultNetworkInstance(dut) for the network instance name. This change is about the bgp instance name. (thanks for pointing that out @LimeHat)

The OC default for this leaf is DEFAULT. Since this test does not require using a non-default name, the device is expected to use DEFAULT.

The need to use a name which is not DEFAULT should be via a deviation.

Hi, still waiting to see a deviation specifically for cisco added to use this non-standard bgp protocol instance name of default

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

coveralls · 2024-12-07T01:07:48Z

Pull Request Test Coverage Report for Build 12431277691

Details

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 55.268%

Totals
Change from base Build 12422942759:	0.0%
Covered Lines:	1983
Relevant Lines:	3588

💛 - Coveralls

ram-mac · 2024-12-16T11:59:53Z

@singh-prem can you resolve the conflicts and also rebase the checks

dplore · 2024-12-17T21:47:16Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -235,7 +238,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice) {

 	// setup BGP
 	networkInstance := dutOcRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
-	networkInstanceProtocolBgp := networkInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	networkInstanceProtocolBgp := networkInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "default")


same here, introduce a deviation for the BGP instance name. The standard should be "DEFAULT" and the deviation can be whatever you supply, specific for your NOS requirement.

dplore · 2024-12-17T21:47:32Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -320,13 +323,19 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
 func awaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, neighbors []string) {
 	for _, neighbor := range neighbors {
 		gnmi.Await(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).
-			Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").
+			Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "default").


same here, introduce a deviation for the BGP instance name

Also suggest to use utility method to configure default network instance
fptest.ConfigureDefaultNetworkInstance from the cfgplugin utility

@ram-mac , FYI: as noted above, this is the bgp protocol instance name, not the network-instance name. But yes, a new deviation for Cisco is needed to set the bgp protocol instance name

dplore · 2024-12-17T22:18:29Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -479,6 +489,17 @@ func configureTableConnection(t *testing.T, dut *ondatra.DUTDevice, isV4, mPropa
 	}

 	batchSet.Set(t, dut)
+	if deviations.TcMetricPropagationUnsupported(dut) {
+		med := medZero


This needs to use switch dut.Vendor() format. See the requirements for deviations at:

featureprofiles/internal/deviations/README.md

Lines 182 to 187 in f80fb73

if deviations.RequiredOCNotSupported(t, dut) {

switch dut.Vendor() {

case ondatra.VENDOR_X:

configureDeviceUsingCli(t, dut, vendorXConfig)

}

}

(This is because the CLI you are adding is specific to Cisco. Other vendors may also use this deviation, but with their own CLI)

dplore · 2024-12-17T22:19:12Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

+				med = medIPv6
+			}
+		}
+		setMetricViaCLI(t, dut, isV4, med, importPolicy)


Suggested change

setMetricViaCLI(t, dut, isV4, med, importPolicy)

setMetricViaCiscoCLI(t, dut, isV4, med, importPolicy)

dplore · 2024-12-17T22:27:21Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

+	helpers.GnmiCLIConfig(t, dut, cliConfig)
+}
+
+func setMetricViaCLI(t *testing.T, dut *ondatra.DUTDevice, isV4 bool, metric int, routePolicyName string) {


Move this functon to a new file in internal/cfgplugins such as tableconnections.go

Suggest renaming the function to DeviationCiscoTableConnectionsBGPtoStaticMetricPropagation or similar.

Add a description such as:
This function is used as an alternative to /network-instances/network-instance/table-connections/table-connection/config/disable-metric-propagation. In OC this path is set to 'false' by default, therefore enabling table-connections to propagate metrics from one protocol to another. This deviation implements CLI to perform the equivalent function.

dplore · 2024-12-17T22:35:38Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

+	if deviations.BgpCommunitySetRefsUnsupported(dut) {
+		setCommunityViaCLI(t, dut, redistributeStaticPolicyName, policyStatementName, communitySetName)
+	}


This needs to use switch dut.Vendor() format. See the requirements for deviations at:

featureprofiles/internal/deviations/README.md

Lines 182 to 187 in f80fb73

if deviations.RequiredOCNotSupported(t, dut) {

switch dut.Vendor() {

case ondatra.VENDOR_X:

configureDeviceUsingCli(t, dut, vendorXConfig)

}

}

(This is because the CLI you are adding is specific to Cisco. Other vendors may also use this deviation, but with their own CLI)

dplore · 2024-12-17T22:36:08Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

+		if deviations.TcAttributePropagationUnsupported(dut) {
+			setAttributeViaCLI(t, dut, redistributeStaticPolicyNameV6, "statement-v6", "prefix-set-v6", medIPv6, "igp")
+		}


This needs to use switch dut.Vendor() format. See the requirements for deviations at:

featureprofiles/internal/deviations/README.md

Lines 182 to 187 in f80fb73

if deviations.RequiredOCNotSupported(t, dut) {

switch dut.Vendor() {

case ondatra.VENDOR_X:

configureDeviceUsingCli(t, dut, vendorXConfig)

}

}

(This is because the CLI you are adding is specific to Cisco. Other vendors may also use this deviation, but with their own CLI)

dplore · 2024-12-17T22:37:55Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

+	time.Sleep(15 * time.Second)

-	_, ok := gnmi.WatchAll(t, ate.OTG(), gnmi.OTG().BgpPeer(bgpPeerName).UnicastIpv4PrefixAny().State(),
-		time.Minute, func(v *ygnmi.Value[*otgtelemetry.BgpPeer_UnicastIpv4Prefix]) bool {
-			return v.IsPresent()
-		}).Await(t)
-
-	if !ok {
-		t.Errorf("No BGP prefixes learnt")
-	}
-
-	bgpPrefixes := gnmi.GetAll(t, ate.OTG(), gnmi.OTG().BgpPeer(bgpPeerName).UnicastIpv4PrefixAny().State())


Using sleep instead of gnmi Watch Await is an anti-pattern. Why does gnmi Await not work on Cisco? Please remove this.

dplore · 2024-12-17T22:38:50Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

-	time.Sleep(5 * time.Second)
+	time.Sleep(15 * time.Second)

-	bgpPrefixes := gnmi.GetAll[*otgtelemetry.BgpPeer_UnicastIpv6Prefix](t, ate.OTG(), gnmi.OTG().BgpPeer(bgpPeerName).UnicastIpv6PrefixAny().State())
+	bgpPrefixEntries := gnmi.LookupAll[*otgtelemetry.BgpPeer_UnicastIpv6Prefix](t, ate.OTG(), gnmi.OTG().BgpPeer(bgpPeerName).UnicastIpv6PrefixAny().State())


this should be refactored to use gnmi watch await

dplore · 2024-12-17T22:47:48Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -827,6 +866,57 @@ func redistributeIPv4PrefixRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, ate
 	verifyTraffic(t, ate, otgConfig)
 }

+func setAttributeViaCLI(t *testing.T, dut *ondatra.DUTDevice, policyName string, statement string, prefixSetName string, setMed int, origin string) {


Move this function to a new file in internal/cfgplugins in bgp_policy.go

Suggest renaming the function to DeviationCiscoRoutingPolicyBGPActionSetMed or similar.

Add a description such as:

This function is used as an alternative to /routing-policy/policy-definitions/policy-definition/statements/statement/actions/bgp-actions/config/set-med. This deviation implements CLI to perform the equivalent function.

ram-mac · 2024-12-27T04:29:47Z

There are some other changes for the same test - #3444
Can we check if the changes suggested in this PR are repeated in this PR?

dplore · 2024-12-27T18:13:47Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -221,7 +224,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice) {
 	t.Helper()

 	dutOcRoot := &oc.Root{}
-	bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "default")


Hi, still waiting to see a deviation specifically for cisco added to use this non-standard bgp protocol instance name of default

dplore · 2024-12-27T18:15:01Z

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go

@@ -320,13 +323,19 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
 func awaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, neighbors []string) {
 	for _, neighbor := range neighbors {
 		gnmi.Await(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).
-			Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").
+			Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "default").


@ram-mac , FYI: as noted above, this is the bgp protocol instance name, not the network-instance name. But yes, a new deviation for Cisco is needed to set the bgp protocol instance name

dplore · 2025-01-03T01:09:22Z

There are some other changes for the same test - #3444 Can we check if the changes suggested in this PR are repeated in this PR?

We'll have to review these PR's one at a time unfortunately. I am giving this PR (#3613) priority for review first. After #3613 is merged, then #3444 will need to merge to mater and resolve and conflicts

singh-prem added 2 commits November 29, 2024 16:40

intial code

67ee3dd

defined deviations

e467944

singh-prem requested review from dplore and a team as code owners November 29, 2024 11:30

updated deviation usage

e86663c

arvbaska1 added the cisco-pr label Nov 29, 2024

LimeHat reviewed Dec 3, 2024

View reviewed changes

...ution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go Show resolved Hide resolved

dplore self-assigned this Dec 7, 2024

dplore mentioned this pull request Dec 7, 2024

fixes static to bgp redistribution test cases #3418

Closed

ram-mac assigned singh-prem and unassigned dplore Dec 16, 2024

dplore requested changes Dec 17, 2024

View reviewed changes

Merge branch 'main' into singh-prem/rt1dot27

9f18c0d

singh-prem requested a review from a team December 20, 2024 12:17

dplore requested changes Dec 27, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RT-1.27: fixed failed tests #3613

RT-1.27: fixed failed tests #3613

singh-prem commented Nov 29, 2024

OpenConfigBot commented Nov 29, 2024 •

edited

Loading

LimeHat Dec 3, 2024

dplore Dec 7, 2024

singh-prem Dec 9, 2024

LimeHat Dec 9, 2024

dplore Dec 17, 2024

dplore Dec 27, 2024

coveralls commented Dec 7, 2024 •

edited

Loading

ram-mac commented Dec 16, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

ram-mac Dec 19, 2024

dplore Dec 27, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

dplore Dec 17, 2024

ram-mac commented Dec 27, 2024

dplore Dec 27, 2024

dplore Dec 27, 2024

dplore commented Jan 3, 2025

	if deviations.RequiredOCNotSupported(t, dut) {
	switch dut.Vendor() {
	case ondatra.VENDOR_X:
	configureDeviceUsingCli(t, dut, vendorXConfig)
	}
	}

	setMetricViaCLI(t, dut, isV4, med, importPolicy)
	setMetricViaCiscoCLI(t, dut, isV4, med, importPolicy)

RT-1.27: fixed failed tests #3613

Are you sure you want to change the base?

RT-1.27: fixed failed tests #3613

Conversation

singh-prem commented Nov 29, 2024

OpenConfigBot commented Nov 29, 2024 • edited Loading

Pull Request Functional Test Report for #3613 / 9f18c0d

Virtual Devices

Hardware Devices

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Dec 7, 2024 • edited Loading

Pull Request Test Coverage Report for Build 12431277691

Details

💛 - Coveralls

ram-mac commented Dec 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ram-mac commented Dec 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dplore commented Jan 3, 2025

OpenConfigBot commented Nov 29, 2024 •

edited

Loading

Pull Request Functional Test Report for #3613 / `9f18c0d`

coveralls commented Dec 7, 2024 •

edited

Loading