Skip to content

Commit

Permalink
Project import generated by Copybara. (openconfig#1899)
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 548816875
  • Loading branch information
@bstoll
bstoll authored Jul 18, 2023
1 parent 7fdbdf1 commit 952ffd5
Show file tree
Hide file tree
Showing 19 changed files with 86 additions and 43 deletions.
6 changes: 4 additions & 2 deletions feature/qos/ate_tests/bursty_traffic_test/bursty_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,10 @@ func TestBurstyTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/ate_tests/bursty_traffic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
1 change: 1 addition & 0 deletions feature/qos/ate_tests/mixed_sp_wrr_traffic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ platform_exceptions: {
deviations: {
dequeue_delete_not_counted_as_drops: true
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/ate_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,10 @@ func TestMixedSPWrrTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/ate_tests/qos_basic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/ate_tests/qos_basic_test/qos_basic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,10 @@ func TestBasicConfigWithTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/ate_tests/qos_output_queue_counters_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/ate_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,10 @@ func TestQoSCounters(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
6 changes: 4 additions & 2 deletions feature/qos/otg_tests/bursty_traffic_test/bursty_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,10 @@ func TestBurstyTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/otg_tests/bursty_traffic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
1 change: 1 addition & 0 deletions feature/qos/otg_tests/mixed_sp_wrr_traffic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ platform_exceptions: {
deviations: {
dequeue_delete_not_counted_as_drops: true
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/otg_tests/mixed_sp_wrr_traffic_test/mixed_sp_wrr_traffic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,10 @@ func TestMixedSPWrrTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/otg_tests/qos_basic_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/otg_tests/qos_basic_test/qos_basic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,10 @@ func TestBasicConfigWithTraffic(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
1 change: 1 addition & 0 deletions feature/qos/otg_tests/qos_output_queue_counters_test/metadata.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ platform_exceptions: {
}
deviations: {
interface_enabled: true
qos_octets: true
}
}
6 changes: 4 additions & 2 deletions feature/qos/otg_tests/qos_output_queue_counters_test/qos_output_queue_counters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ func TestQoSCounters(t *testing.T) {
dutOctetCounterDiff := counters["dutQosOctetsAfterTraffic"][data.queue] - counters["dutQosOctetsBeforeTraffic"][data.queue]
ateOctetCounterDiff := counters["ateInPkts"][data.queue] * uint64(data.frameSize)
t.Logf("Queue %q: ateOctetCounterDiff: %v dutOctetCounterDiff: %v", data.queue, ateOctetCounterDiff, dutOctetCounterDiff)
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
if !deviations.QOSOctets(dut) {
if dutOctetCounterDiff < ateOctetCounterDiff {
t.Errorf("Get dutOctetCounterDiff for queue %q: got %v, want >= %v", data.queue, dutOctetCounterDiff, ateOctetCounterDiff)
}
}

if !deviations.QOSDroppedOctets(dut) {
Expand Down
5 changes: 5 additions & 0 deletions internal/deviations/deviations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,11 @@ func SkipControllerCardPowerAdmin(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSkipControllerCardPowerAdmin()
}

// QOSOctets returns if device should skip checking QOS octet stats for interface.
func QOSOctets(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetQosOctets()
}

// Vendor deviation flags.
// All new flags should not be exported (define them in lowercase) and accessed
// from tests through a public accessors like those above.
Expand Down
3 changes: 3 additions & 0 deletions proto/metadata.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ message Metadata {
// Device requires interface enabled leaf booleans to be explicitly set to
// true.
bool interface_enabled = 75;
// Set to true to skip checking QOS octet stats for interface.
// Arista: partnerissuetracker.corp.google.com/283541442
bool qos_octets = 76;
}

message PlatformExceptions {
Expand Down
65 changes: 38 additions & 27 deletions proto/metadata_go_proto/metadata.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 952ffd5

Please sign in to comment.