Adding deviation for rate class unsupport option for the ETH channel …

…configuration (openconfig#3660) * add deviation for ETH channal rate class non-supported. Arista device does not support this yet * bug fix for channel definition in the interface.go file * Revert "add deviation for ETH channal rate class non-supported. Arista device does not support this yet" This reverts commit b1af1fc. * Arista device is not supporting ETH channel rate class yet. Adding this deviation. * adding a new PMD typeof PMD_400GBASE_ZR_PLUS for the functional testing * adding new testbed topology for new optics PMD 400G ZR plus * Update interface.go * updated metadata.pb.go file * Arista device is not supporting ETH channel rate class yet. Adding this deviation. * adding newly introduced deviation of unsupported rate class to the tests * removing folder of tmp * removing empty file called values * add deviation for ETH channal rate class non-supported. Arista device does not support this yet * bug fix for channel definition in the interface.go file * Revert "add deviation for ETH channal rate class non-supported. Arista device does not support this yet" This reverts commit b1af1fc. * Arista device is not supporting ETH channel rate class yet. Adding this deviation. * adding a new PMD typeof PMD_400GBASE_ZR_PLUS for the functional testing * adding new testbed topology for new optics PMD 400G ZR plus * Update interface.go * updated metadata.pb.go file * fixed metadata.pb.go --------- Co-authored-by: Pramod Maurya <[email protected]> Co-authored-by: Yiwen Hu <[email protected]>
nokia · Jan 17, 2025 · 3c40a0a · 3c40a0a
1 parent 2cbb6d4
commit 3c40a0a
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 34 deletions.
diff --git a/feature/platform/transceiver/tests/zr_fec_uncorrectable_frames_test/metadata.textproto b/feature/platform/transceiver/tests/zr_fec_uncorrectable_frames_test/metadata.textproto
@@ -13,6 +13,7 @@ platform_exceptions: {
     interface_enabled: true
     default_network_instance: "default"
     missing_port_to_optical_channel_component_mapping: true
+    channel_assignment_rate_class_parameters_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/platform/transceiver/tests/zr_logical_channels_test/metadata.textproto b/feature/platform/transceiver/tests/zr_logical_channels_test/metadata.textproto
@@ -12,6 +12,7 @@ platform_exceptions: {
     interface_enabled: true
     default_network_instance: "default"
     missing_port_to_optical_channel_component_mapping: true
+    channel_assignment_rate_class_parameters_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/platform/transceiver/tests/zr_pm_test/metadata.textproto b/feature/platform/transceiver/tests/zr_pm_test/metadata.textproto
@@ -11,6 +11,7 @@ platform_exceptions:  {
   }
   deviations:  {
     default_network_instance:  "default"
+    channel_assignment_rate_class_parameters_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/internal/cfgplugins/interface.go b/internal/cfgplugins/interface.go
@@ -140,36 +140,28 @@ func ConfigETHChannel(t *testing.T, dut *ondatra.DUTDevice, interfaceName, trans
 			Transceiver: ygot.String(transceiverName),
 		}
 	}
-	var assignment = map[uint32]*oc.TerminalDevice_Channel_Assignment{}
+	var assignment = map[uint32]*oc.TerminalDevice_Channel_Assignment{
+		0: {
+			Index:          ygot.Uint32(0),
+			LogicalChannel: ygot.Uint32(otnIndex),
+			Description:    ygot.String("ETH to OTN"),
+			Allocation:     ygot.Float64(400),
+			AssignmentType: oc.Assignment_AssignmentType_LOGICAL_CHANNEL,
+		},
+	}
 	if deviations.EthChannelAssignmentCiscoNumbering(dut) {
-		assignment = map[uint32]*oc.TerminalDevice_Channel_Assignment{
-			0: {
-				Index:          ygot.Uint32(1),
-				LogicalChannel: ygot.Uint32(otnIndex),
-				Description:    ygot.String("ETH to OTN"),
-				Allocation:     ygot.Float64(400),
-				AssignmentType: oc.Assignment_AssignmentType_LOGICAL_CHANNEL,
-			},
-		}
-	} else {
-		assignment = map[uint32]*oc.TerminalDevice_Channel_Assignment{
-			0: {
-				Index:          ygot.Uint32(0),
-				LogicalChannel: ygot.Uint32(otnIndex),
-				Description:    ygot.String("ETH to OTN"),
-				Allocation:     ygot.Float64(400),
-				AssignmentType: oc.Assignment_AssignmentType_LOGICAL_CHANNEL,
-			},
-		}
+		assignment[0].Index = ygot.Uint32(1)
 	}
-	channel := &oc.TerminalDevice_Channel{
+	var 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,
 	}
+	if !deviations.ChannelRateClassParametersUnsupported(dut) {
+		channel.RateClass = oc.TransportTypes_TRIBUTARY_RATE_CLASS_TYPE_TRIB_RATE_400G
+	}
 	gnmi.Replace(t, dut, gnmi.OC().TerminalDevice().Channel(ethIndex).Config(), channel)
 }
diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -1292,3 +1292,8 @@ func DefaultBgpInstanceName(dut *ondatra.DUTDevice) string {
 	}
 	return "DEFAULT"
 }
+
+// ChannelRateClassParametersUnsupported returns true if channel rate class parameters are unsupported
+func ChannelRateClassParametersUnsupported(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetChannelAssignmentRateClassParametersUnsupported()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -38,6 +38,7 @@ message Metadata {
     TESTBED_DUT_DUT_ATE_2LINKS = 6;
     TESTBED_DUT_ATE_8LINKS = 7;
     TESTBED_DUT_400ZR = 8;
+    TESTBED_DUT_400ZR_PLUS = 9;
   }
   // Testbed on which the test is intended to run.
   Testbed testbed = 4;
@@ -686,6 +687,8 @@ message Metadata {
     // Cisco: b/388983709
     // default bgp instance name is used to set bgp instance name value other than DEFAULT
     string default_bgp_instance_name = 246;
+    // Arista does not support ETHChannel rate-class
+    bool channel_assignment_rate_class_parameters_unsupported = 247;
 
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;

diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go
diff --git a/topologies/dut_400zr_plus.testbed b/topologies/dut_400zr_plus.testbed
@@ -0,0 +1,23 @@
+# proto-file: github.com/openconfig/ondatra/blob/main/proto/testbed.proto
+# proto-message: ondatra.Testbed
+
+# 1 DUT, 2 port, 400ZR_PLUS optics
+
+duts {
+  id: "dut"
+  ports {
+    id: "port1"
+    speed: S_400GB
+    pmd: PMD_400GBASE_ZR_PLUS
+  }
+  ports {
+    id: "port2"
+    speed: S_400GB
+    pmd: PMD_400GBASE_ZR_PLUS
+  }
+}
+
+links {
+  a: "dut:port1"
+  b: "dut:port2"
+}