gNMI-1.15: gnmi_set_test.go : Added deviation (openconfig#2328)

* updated gnmisettest * Resolving conflicts * Restored version in metadata.pb.go * Resolving conflicts * Resolving conflicts * updated with deviation * Resolving conflicts * Resolving conflicts * Added deviation back * Resolved conflicts * Resolved conflicts * Updated the verification under the deviation skipStaticNexthopCheck to use wildcard for index instead of specific index * Updated variable assignment * Resolving conflicts * Resolving conflicts * Resolved conflicts * Updated code to get AE index * updated with testbed * resolved conflicts * fixed spacing * fixed spacing * fixed spacing * Resolving conclifts * resolving conflicts --------- Co-authored-by: mohanasm <[email protected]> Co-authored-by: Arul Kumar Sekar <[email protected]>
nokia · Dec 28, 2023 · f59b129 · f59b129
1 parent 9181594
commit f59b129
Show file tree

Hide file tree

Showing 6 changed files with 138 additions and 41 deletions.
diff --git a/feature/system/gnmi/set/tests/gnmi_set_test/README.md b/feature/system/gnmi/set/tests/gnmi_set_test/README.md
@@ -4,6 +4,11 @@
 
 Ensures that the device respects certain gNMI SetRequest corner case behaviors.
 
+## Topology
+
+*   ATE port-1 and DUT port-1
+*   ATE port-2 and DUT port-2
+
 ## Procedure
 
 Each test should be implemented as three variants:

diff --git a/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go b/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go
@@ -156,14 +156,29 @@ func TestDeleteInterface(t *testing.T) {
 
 		config.DeleteInterface(p1.Name())
 		config.DeleteInterface(p2.Name())
+
+		for _, iname := range scope.interfaces {
+			iface := config.GetInterface(iname)
+			if iface == nil {
+				config.Interface = nil
+
+			}
+		}
+
 		op.push(t, dut, config, scope)
 
 		t.Run("VerifyAfterDelete", func(t *testing.T) {
 			if v := gnmi.Lookup(t, dut, q1); v.IsPresent() {
-				t.Errorf("State got unwanted %v", v)
+				value, _ := v.Val()
+				if value != "" {
+					t.Errorf("State got unwanted %v", v)
+				}
 			}
 			if v := gnmi.Lookup(t, dut, q2); v.IsPresent() {
-				t.Errorf("State got unwanted %v", v)
+				value, _ := v.Val()
+				if value != "" {
+					t.Errorf("State got unwanted %v", v)
+				}
 			}
 		})
 	})
@@ -504,12 +519,32 @@ func TestStaticProtocol(t *testing.T) {
 			verifyInterface(t, dut, p2.Name(), &ip2)
 
 			v1 := gnmi.Lookup(t, dut, q1)
+			if deviations.SkipStaticNexthopCheck(dut) {
+
+				q2 := sp.Static(prefix1).NextHopAny().InterfaceRef().Interface().State()
+				val := gnmi.LookupAll(t, dut, q2)
+				if len(val) > 0 {
+					v1 = val[0]
+				} else {
+					t.Fatalf("Did not receive output for static nexthop lookup")
+				}
+			}
 			if got, ok := v1.Val(); !ok || got != p1.Name() {
 				t.Errorf("State got %v, want %v", v1, p1.Name())
 			} else {
 				t.Logf("Verified %v", v1)
 			}
 			v2 := gnmi.Lookup(t, dut, q2)
+			if deviations.SkipStaticNexthopCheck(dut) {
+
+				q3 := sp.Static(prefix2).NextHopAny().InterfaceRef().Interface().State()
+				val := gnmi.LookupAll(t, dut, q3)
+				if len(val) > 0 {
+					v2 = val[0]
+				} else {
+					t.Fatalf("Did not receive output for static nexthop lookup")
+				}
+			}
 			if got, ok := v2.Val(); !ok || got != p2.Name() {
 				t.Errorf("State got %v, want %v", v2, p2.Name())
 			} else {
@@ -531,12 +566,32 @@ func TestStaticProtocol(t *testing.T) {
 			verifyInterface(t, dut, p2.Name(), &ip2)
 
 			v1 := gnmi.Lookup(t, dut, q1)
+			if deviations.SkipStaticNexthopCheck(dut) {
+
+				q2 := sp.Static(prefix1).NextHopAny().InterfaceRef().Interface().State()
+				val := gnmi.LookupAll(t, dut, q2)
+				if len(val) > 0 {
+					v1 = val[0]
+				} else {
+					t.Fatalf("Did not receive output for static nexthop lookup")
+				}
+			}
 			if got, ok := v1.Val(); !ok || got != p2.Name() {
 				t.Errorf("State got %v, want %v", v1, p2.Name())
 			} else {
 				t.Logf("Verified %v", v1)
 			}
 			v2 := gnmi.Lookup(t, dut, q2)
+			if deviations.SkipStaticNexthopCheck(dut) {
+
+				q3 := sp.Static(prefix2).NextHopAny().InterfaceRef().Interface().State()
+				val := gnmi.LookupAll(t, dut, q3)
+				if len(val) > 0 {
+					v2 = val[0]
+				} else {
+					t.Fatalf("Did not receive output for static nexthop lookup")
+				}
+			}
 			if got, ok := v2.Val(); !ok || got != p1.Name() {
 				t.Errorf("State got %v, want %v", v2, p1.Name())
 			} else {
@@ -581,7 +636,13 @@ func nextAggregates(t *testing.T, dut *ondatra.DUTDevice, n int) []string {
 		agg := numRE.ReplaceAllStringFunc(firstAgg, func(_ string) string {
 			return strconv.Itoa(i)
 		})
-		aggs = append(aggs, agg)
+		//some aggregate interface after firstAgg may already be present in the system.
+		_, present := gnmi.Lookup(t, dut, gnmi.OC().Interface(agg).Name().State()).Val()
+		if !present {
+			aggs = append(aggs, agg)
+		} else {
+			n++
+		}
 	}
 	return aggs
 }
@@ -648,6 +709,7 @@ func attachInterface(ni *oc.NetworkInstance, name string, sub int) string {
 	niface := ni.GetOrCreateInterface(id)
 	niface.Interface = ygot.String(name)
 	niface.Subinterface = ygot.Uint32(uint32(sub))
+	id = fmt.Sprintf("%s.%d", id, sub)
 	return id
 }
 

diff --git a/feature/system/gnmi/set/tests/gnmi_set_test/metadata.textproto b/feature/system/gnmi/set/tests/gnmi_set_test/metadata.textproto
@@ -1,10 +1,10 @@
 # proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
 # proto-message: Metadata
 
-uuid: "fe01cad6-6775-45cd-a025-d960ca6c04af"
+uuid: "e50991a4-bb40-4162-8a86-717e68e10680"
 plan_id: "gNMI-1.15"
 description: "Set Requests"
-testbed: TESTBED_DUT
+testbed: TESTBED_DUT_ATE_2LINKS
 platform_exceptions: {
   platform: {
     vendor: CISCO
@@ -13,6 +13,14 @@ platform_exceptions: {
     ipv4_missing_enabled: true
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: JUNIPER
+  }
+  deviations: {
+    skip_static_nexthop_check: true
+  }
+}
 platform_exceptions: {
   platform: {
     vendor: ARISTA

diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -725,3 +725,8 @@ func ISISMetricStyleTelemetryUnsupported(dut *ondatra.DUTDevice) bool {
 func StaticRouteNextHopInterfaceRefUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetStaticRouteNextHopInterfaceRefUnsupported()
 }
+
+// SkipStaticNexthopCheck returns if device needs index starting from non zero
+func SkipStaticNexthopCheck(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetSkipStaticNexthopCheck()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -386,6 +386,9 @@ message Metadata {
     bool isis_metric_style_telemetry_unsupported = 134;
     // Devices do not support configuring Interface-ref under Static-Route Next-Hop
     bool static_route_next_hop_interface_ref_unsupported = 135;
+    // Devices which does not support nexthop index state
+    // Juniper: b/304729237
+    bool skip_static_nexthop_check = 136;
 
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19; 

diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go