DP-1.7: Adding test support for Nokia

feature/qos/otg_tests/one_sp_queue_traffic_test/metadata.textproto

@@ -26,8 +26,10 @@ platform_exceptions: {
     vendor: NOKIA
   }
   deviations: {
-    explicit_interface_ref_definition: true
     interface_enabled: true
+    explicit_port_speed: true
+    explicit_interface_in_default_vrf: true
+    qos_queue_requires_id: true
   }
 }
 platform_exceptions: {

feature/qos/otg_tests/one_sp_queue_traffic_test/one_sp_queue_traffic_test.go

@@ -144,6 +144,7 @@ func TestOneSPQueueTraffic(t *testing.T) {
 	var tolerance float32 = 2.0
 
 	queues := netutil.CommonTrafficQueues(t, dut)
+
 	if dut.Vendor() == ondatra.JUNIPER {
 		queues.AF4 = "5"
 	}
@@ -787,6 +788,14 @@ func ConfigureDUTIntf(t *testing.T, dut *ondatra.DUTDevice) {
 		a := s.GetOrCreateAddress(intf.ipAddr)
 		a.PrefixLength = ygot.Uint8(intf.prefixLen)
 		gnmi.Replace(t, dut, gnmi.OC().Interface(intf.intfName).Config(), i)
+		if deviations.ExplicitInterfaceInDefaultVRF(dut) {
+			fptest.AssignToNetworkInstance(t, dut, intf.intfName, deviations.DefaultNetworkInstance(dut), 0)
+		}
+	}
+	if deviations.ExplicitPortSpeed(dut) {
+		fptest.SetPortSpeed(t, dp1)
+		fptest.SetPortSpeed(t, dp2)
+		fptest.SetPortSpeed(t, dp3)
 	}
 }
 
@@ -798,6 +807,16 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
 	d := &oc.Root{}
 	q := d.GetOrCreateQos()
 	queues := netutil.CommonTrafficQueues(t, dut)
+
+	if deviations.QOSQueueRequiresID(dut) {
+		queueNames := []string{queues.NC1, queues.AF4, queues.AF3, queues.AF2, queues.AF1, queues.BE0, queues.BE1}
+		for i, queue := range queueNames {
+			q1 := q.GetOrCreateQueue(queue)
+			q1.Name = ygot.String(queue)
+			queueid := len(queueNames) - i
+			q1.QueueId = ygot.Uint8(uint8(queueid))
+		}
+	}
 	if dut.Vendor() == ondatra.JUNIPER {
 		queues.AF4 = "5"
 	}
@@ -1146,6 +1165,7 @@ func ConfigureQoS(t *testing.T, dut *ondatra.DUTDevice) {
 		gnmi.Replace(t, dut, gnmi.OC().Qos().Config(), q)
 	}
 }
+
 func ConfigureCiscoQos(t *testing.T, dut *ondatra.DUTDevice) {
 	t.Helper()
 	dp1 := dut.Port(t, "port1")

internal/deviations/deviations.go

@@ -597,7 +597,7 @@ func ISISCounterPartChangesUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetIsisCounterPartChangesUnsupported()
 }
 
-// SkipTCPNegotiatedMssCheck returns true for devices that do not
+// SkipTCPNegotiatedMSSCheck returns true for devices that do not
 // support telemetry to check negotiated tcp mss value.
 func SkipTCPNegotiatedMSSCheck(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetSkipTcpNegotiatedMssCheck()
@@ -620,3 +620,8 @@ func InterfaceLoopbackModeRawGnmi(dut *ondatra.DUTDevice) bool {
 func ISISLspMetadataLeafsUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetIsisLspMetadataLeafsUnsupported()
 }
+
+// QOSQueueRequiresID returns if device should configure QOS queue along with queue-id
+func QOSQueueRequiresID(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetQosQueueRequiresId()
+}

proto/metadata.proto

@@ -337,6 +337,8 @@ message Metadata {
     // Devices don't support ISIS-Lsp metadata paths: checksum, sequence-number,
     // remaining-lifetime.
     bool isis_lsp_metadata_leafs_unsupported = 111;
+    // QOS queue requires configuration with queue-id
+    bool qos_queue_requires_id = 112;
 
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 90;