Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating flow count and traffic duration #2792

Merged
merged 27 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b8f826c
Udating flow count and traffic duration
cprabha Mar 12, 2024
694d744
Merge branch 'main' into TE-16.1
cprabha Mar 18, 2024
3dafe6d
Merge branch 'main' into TE-16.1
cprabha Mar 19, 2024
9622832
Merge branch 'main' into TE-16.1
cprabha Mar 25, 2024
df53731
Adding deviation
cprabha Apr 4, 2024
116faad
Merge branch 'main' into TE-16.1
cprabha Apr 4, 2024
f208d4a
Merge branch 'main' into TE-16.1
cprabha Apr 9, 2024
ed8def7
Merge branch 'main' into TE-16.1
ram-mac Apr 22, 2024
b33e7bb
Merge branch 'main' into TE-16.1
cprabha Apr 22, 2024
a3086a3
Merge branch 'main' into TE-16.1
cprabha Apr 23, 2024
f57e7cc
Removed delay calls
cprabha Apr 23, 2024
8f09c50
Merge branch 'TE-16.1' of https://github.com/cprabha/featureprofiles …
cprabha Apr 23, 2024
929a101
Merge branch 'main' into TE-16.1
cprabha Apr 24, 2024
3592158
Merge branch 'main' into TE-16.1
cprabha Apr 25, 2024
e19b35e
Merge branch 'main' into TE-16.1
cprabha May 1, 2024
72c95ec
Merge branch 'main' into TE-16.1
cprabha May 8, 2024
30b1790
Merge branch 'main' into TE-16.1
cprabha May 14, 2024
58e1c39
Merge branch 'main' into TE-16.1
cprabha May 31, 2024
d692ac1
Merge branch 'main' into TE-16.1
cprabha Jun 11, 2024
ea02a87
Merge branch 'main' into TE-16.1
cprabha Jun 12, 2024
445e630
Merge branch 'main' into TE-16.1
cprabha Jun 12, 2024
2a98caf
Merge branch 'main' into TE-16.1
cprabha Jun 19, 2024
af63f38
Merge branch 'main' into TE-16.1
cprabha Jun 20, 2024
401b7df
fixing channelized interfaces speed issue
cprabha Jun 21, 2024
e45c3a5
Merge branch 'TE-16.1' of https://github.com/cprabha/featureprofiles …
cprabha Jun 21, 2024
a57f16f
Merge branch 'main' into TE-16.1
Swetha-haridasula Jun 27, 2024
fe00898
Merge branch 'main' into TE-16.1
cprabha Jun 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const (
vrfEncapB = "ENCAP_TE_VRF_B"
ipv4PrefixLen = 30
ipv6PrefixLen = 126
trafficDuration = 15 * time.Second
trafficDuration = 30 * time.Second
nhg10ID = 10
nh201ID = 201
nh202ID = 202
Expand Down Expand Up @@ -95,7 +95,7 @@ const (
ipv4EntryPrefixLen = 24
ipv6FlowIP = "2015:aa8::1"
ipv6EntryPrefix = "2015:aa8::"
ipv6EntryPrefixLen = 32
ipv6EntryPrefixLen = 64
ratioTunEncap1 = 0.25 // 1/4
ratioTunEncap2 = 0.75 // 3/4
ratioTunEncapTol = 0.05 // 5/100
Expand Down Expand Up @@ -791,7 +791,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
for idx, a := range []attrs.Attributes{dutPort1, dutPort2, dutPort3, dutPort4, dutPort5} {
p := portList[idx]
intf := a.NewOCInterface(p.Name(), dut)
if p.PMD() == ondatra.PMD100GBASEFR && dut.Vendor() != ondatra.CISCO {
if p.PMD() == ondatra.PMD100GBASEFR && dut.Vendor() != ondatra.CISCO && dut.Vendor() != ondatra.JUNIPER {
e := intf.GetOrCreateEthernet()
e.AutoNegotiate = ygot.Bool(false)
e.DuplexMode = oc.Ethernet_DuplexMode_FULL
Expand Down Expand Up @@ -918,13 +918,15 @@ func (fa *flowAttr) getFlow(flowType string, name string, dscp uint32) gosnappi.
innerV4 := flow.Packet().Add().Ipv4()
innerV4.Src().SetValue(innerV4SrcIP)
innerV4.Dst().SetValue(innerV4DstIP)
innerV4.Priority().Dscp().Phb().SetValue(dscp)
}

// add inner ipv6 headers
if flowType == "ipv6in4" {
innerV6 := flow.Packet().Add().Ipv6()
innerV6.Src().SetValue(InnerV6SrcIP)
innerV6.Dst().SetValue(InnerV6DstIP)
innerV6.TrafficClass().SetValue(dscp << 2)
}
} else if flowType == "ipv6" {
v6 := flow.Packet().Add().Ipv6()
Expand All @@ -945,8 +947,13 @@ func sendTraffic(t *testing.T, args *testArgs, flows []gosnappi.Flow, capture bo
otg := args.ate.OTG()
args.topo.Flows().Clear().Items()
args.topo.Flows().Append(flows...)

otg.PushConfig(t, args.topo)
otg.StartProtocols(t)

otgutils.WaitForARP(t, args.ate.OTG(), args.topo, "IPv4")
otgutils.WaitForARP(t, args.ate.OTG(), args.topo, "IPv6")

if capture {
startCapture(t, args.ate)
defer stopCapture(t, args.ate)
Expand Down
8 changes: 8 additions & 0 deletions feature/gribi/otg_tests/basic_encap_test/metadata.textproto
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ platform_exceptions: {
pf_require_sequential_order_pbr_rules: true
}
}
platform_exceptions: {
platform: {
vendor: JUNIPER
}
deviations: {
ttl_copy_unsupported: true
}
}
platform_exceptions: {
platform: {
vendor: ARISTA
Expand Down
Loading