From 0439ee901790f5b1c2bed396c71b6a4685bd0b2e Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 17 Dec 2024 19:51:15 +0000 Subject: [PATCH] Revert "add deviation for ETH channal rate class non-supported. Arista device does not support this yet" This reverts commit b1af1fc706cad45f9bdeb4e97fd3341e88b2d965. --- internal/cfgplugins/interface.go | 28 ++++++++-------------------- internal/deviations/deviations.go | 5 ----- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/internal/cfgplugins/interface.go b/internal/cfgplugins/interface.go index c3de901fa4c..9a140168fd2 100644 --- a/internal/cfgplugins/interface.go +++ b/internal/cfgplugins/interface.go @@ -162,26 +162,14 @@ func ConfigETHChannel(t *testing.T, dut *ondatra.DUTDevice, interfaceName, trans }, } } - var channel *oc.TerminalDevice_Channel - if deviations.ChannelRateClassParametersUnsupported(dut) { - channel = &oc.TerminalDevice_Channel{ - Description: ygot.String("ETH Logical Channel"), - Index: ygot.Uint32(ethIndex), - LogicalChannelType: oc.TransportTypes_LOGICAL_ELEMENT_PROTOCOL_TYPE_PROT_ETHERNET, - TribProtocol: oc.TransportTypes_TRIBUTARY_PROTOCOL_TYPE_PROT_400GE, - Ingress: ingress, - Assignment: assignment, - } - } else { - channel = &oc.TerminalDevice_Channel{ - Description: ygot.String("ETH Logical Channel"), - Index: ygot.Uint32(ethIndex), - LogicalChannelType: oc.TransportTypes_LOGICAL_ELEMENT_PROTOCOL_TYPE_PROT_ETHERNET, - TribProtocol: oc.TransportTypes_TRIBUTARY_PROTOCOL_TYPE_PROT_400GE, - RateClass: oc.TransportTypes_TRIBUTARY_RATE_CLASS_TYPE_TRIB_RATE_400G, - Ingress: ingress, - Assignment: assignment, - } + channel = &oc.TerminalDevice_Channel{ + Description: ygot.String("ETH Logical Channel"), + Index: ygot.Uint32(ethIndex), + LogicalChannelType: oc.TransportTypes_LOGICAL_ELEMENT_PROTOCOL_TYPE_PROT_ETHERNET, + TribProtocol: oc.TransportTypes_TRIBUTARY_PROTOCOL_TYPE_PROT_400GE, + RateClass: oc.TransportTypes_TRIBUTARY_RATE_CLASS_TYPE_TRIB_RATE_400G, + Ingress: ingress, + Assignment: assignment, } gnmi.Replace(t, dut, gnmi.OC().TerminalDevice().Channel(ethIndex).Config(), channel) } diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go index 6d9019d5945..c60ba035066 100644 --- a/internal/deviations/deviations.go +++ b/internal/deviations/deviations.go @@ -1243,8 +1243,3 @@ func EnableTableConnections(dut *ondatra.DUTDevice) bool { func NoZeroSuppression(dut *ondatra.DUTDevice) bool { return lookupDUTDeviations(dut).GetNoZeroSuppression() } - -// ChannelRateClassParametersUnsupported returns true if channel rate class parameters are unsupported -func ChannelRateClassParametersUnsupported(dut *ondatra.DUTDevice) bool { - return lookupDUTDeviations(dut).GetChannelAssignmentRateClassParametersUnsupported() -}