Skip to content

Commit b1dfa9d

Browse files
added changes
1 parent fd4ae5f commit b1dfa9d

File tree

2 files changed

+59
-48
lines changed

2 files changed

+59
-48
lines changed

feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/metadata.textproto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platform_exceptions: {
2020
next_hop_group_config_unsupported: true
2121
policy_forwarding_unsupported: true
2222
interface_policy_forwarding_unsupported: true
23-
ipv4_static_route_with_ipv6_nh_unsupported: true
2423
qos_classification_unsupported: true
2524
}
2625
}

feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/staticgueencap_and_bgp_path_selection_test.go

Lines changed: 59 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ var (
166166
ate2ppnh1 = &attrs.Attributes{Name: "ate2ppnh1", IPv6: "2001:db8:2::1", IPv6Len: plenIPv6lo}
167167
ate2ppnh2 = &attrs.Attributes{Name: "ate2ppnh2", IPv6: "2001:db8:3::1", IPv6Len: plenIPv6lo}
168168

169-
ate2ppnhPrefix = "2001:db8:2::0/128"
169+
ate2ppnh1Prefix = "2001:db8:2::0/128"
170+
ate2ppnh2Prefix = "2001:db8:3::0/128"
170171

171172
atePorts = map[string]*attrs.Attributes{
172173
"port1": atePort1,
@@ -659,14 +660,25 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
659660
b := &gnmi.SetBatch{}
660661
sV4 := &cfgplugins.StaticRouteCfg{
661662
NetworkInstance: deviations.DefaultNetworkInstance(dut),
662-
Prefix: ate2ppnhPrefix,
663+
Prefix: ate2ppnh1Prefix,
663664
NextHops: map[string]oc.NetworkInstance_Protocol_Static_NextHop_NextHop_Union{
664665
"0": oc.UnionString(nexthopGroupName),
665666
},
666667
}
667668

668669
cfgplugins.NewStaticRouteNextHopGroupCfg(t, b, sV4, dut, nexthopGroupName)
669670

671+
// Configure static routes from PNH to nexthopgroup
672+
sV6 := &cfgplugins.StaticRouteCfg{
673+
NetworkInstance: deviations.DefaultNetworkInstance(dut),
674+
Prefix: ate2ppnh2Prefix,
675+
NextHops: map[string]oc.NetworkInstance_Protocol_Static_NextHop_NextHop_Union{
676+
"0": oc.UnionString(nexthopGroupNameV6),
677+
},
678+
}
679+
680+
cfgplugins.NewStaticRouteNextHopGroupCfg(t, b, sV6, dut, nexthopGroupNameV6)
681+
670682
}
671683

672684
// Configures the given DUT interface.
@@ -1207,51 +1219,51 @@ func TestStaticGue(t *testing.T) {
12071219
Description: "Validate traffic with basic config",
12081220
testFunc: testBaselineTraffic,
12091221
},
1210-
{
1211-
Name: "Testcase: Verify BE1 Traffic Migrated from being routed over the DUT_Port2",
1212-
Description: "Verify BE1 Traffic Migrated from being routed over the DUT_Port2",
1213-
testFunc: testBE1TrafficMigration,
1214-
},
1215-
{
1216-
Name: "Testcase: Verify AF1 Traffic Migrated from being routed over the DUT_Port2",
1217-
Description: "Verify AF1 Traffic Migrated from being routed over the DUT_Port2",
1218-
testFunc: testAF1TrafficMigration,
1219-
},
1220-
{
1221-
Name: "Testcase: Verify AF2 Traffic Migrated from being routed over the DUT_Port2",
1222-
Description: "Verify AF2 Traffic Migrated from being routed over the DUT_Port2",
1223-
testFunc: testAF2TrafficMigration,
1224-
},
1225-
{
1226-
Name: "Testcase: Verify AF3 Traffic Migrated from being routed over the DUT_Port2",
1227-
Description: "Verify AF3 Traffic Migrated from being routed over the DUT_Port2",
1228-
testFunc: testAF3TrafficMigration,
1229-
},
1230-
{
1231-
Name: "Testcase: Verify AF4 Traffic Migrated from being routed over the DUT_Port2",
1232-
Description: "Verify AF4 Traffic Migrated from being routed over the DUT_Port2",
1233-
testFunc: testAF4TrafficMigration,
1234-
},
1235-
// {
1236-
// Name: "Testcase: DUT as a GUE Decap Node",
1237-
// Description: "Verify DUT as a GUE Decap Node",
1238-
// testFunc: testDUTDecapNode,
1239-
// },
1240-
{
1241-
Name: "Testcase: Negative Scenario - EBGP Route for remote tunnel endpoints Removed",
1242-
Description: "Verify EBGP Route for remote tunnel endpoints Removed",
1243-
testFunc: testTunnelEndpointRemoved,
1244-
},
1245-
// {
1246-
// Name: "Testcase: Negative Scenario - IBGP Route for Remote Tunnel Endpoints Removed",
1247-
// Description: "Verify IBGP Route for Remote Tunnel Endpoints Removed",
1248-
// testFunc: testIbgpTunnelEndpointRemoved,
1249-
// },
1250-
{
1251-
Name: "Testcase: Establish IBGP Peering over EBGP",
1252-
Description: "Verify Establish IBGP Peering over EBGP",
1253-
testFunc: testEstablishIBGPoverEBGP,
1254-
},
1222+
// {
1223+
// Name: "Testcase: Verify BE1 Traffic Migrated from being routed over the DUT_Port2",
1224+
// Description: "Verify BE1 Traffic Migrated from being routed over the DUT_Port2",
1225+
// testFunc: testBE1TrafficMigration,
1226+
// },
1227+
// {
1228+
// Name: "Testcase: Verify AF1 Traffic Migrated from being routed over the DUT_Port2",
1229+
// Description: "Verify AF1 Traffic Migrated from being routed over the DUT_Port2",
1230+
// testFunc: testAF1TrafficMigration,
1231+
// },
1232+
// {
1233+
// Name: "Testcase: Verify AF2 Traffic Migrated from being routed over the DUT_Port2",
1234+
// Description: "Verify AF2 Traffic Migrated from being routed over the DUT_Port2",
1235+
// testFunc: testAF2TrafficMigration,
1236+
// },
1237+
// {
1238+
// Name: "Testcase: Verify AF3 Traffic Migrated from being routed over the DUT_Port2",
1239+
// Description: "Verify AF3 Traffic Migrated from being routed over the DUT_Port2",
1240+
// testFunc: testAF3TrafficMigration,
1241+
// },
1242+
// {
1243+
// Name: "Testcase: Verify AF4 Traffic Migrated from being routed over the DUT_Port2",
1244+
// Description: "Verify AF4 Traffic Migrated from being routed over the DUT_Port2",
1245+
// testFunc: testAF4TrafficMigration,
1246+
// },
1247+
// // {
1248+
// // Name: "Testcase: DUT as a GUE Decap Node",
1249+
// // Description: "Verify DUT as a GUE Decap Node",
1250+
// // testFunc: testDUTDecapNode,
1251+
// // },
1252+
// {
1253+
// Name: "Testcase: Negative Scenario - EBGP Route for remote tunnel endpoints Removed",
1254+
// Description: "Verify EBGP Route for remote tunnel endpoints Removed",
1255+
// testFunc: testTunnelEndpointRemoved,
1256+
// },
1257+
// // {
1258+
// // Name: "Testcase: Negative Scenario - IBGP Route for Remote Tunnel Endpoints Removed",
1259+
// // Description: "Verify IBGP Route for Remote Tunnel Endpoints Removed",
1260+
// // testFunc: testIbgpTunnelEndpointRemoved,
1261+
// // },
1262+
// {
1263+
// Name: "Testcase: Establish IBGP Peering over EBGP",
1264+
// Description: "Verify Establish IBGP Peering over EBGP",
1265+
// testFunc: testEstablishIBGPoverEBGP,
1266+
// },
12551267
}
12561268

12571269
// Run the test cases.

0 commit comments

Comments
 (0)