resolved conflicts

openconfig · Oct 16, 2024 · 0850645 · 0850645
1 parent 38706dc
commit 0850645
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 45 deletions.
diff --git a/feature/system/tests/system_base_test/g_protocol_test.go b/feature/system/tests/system_base_test/g_protocol_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/openconfig/featureprofiles/internal/deviations"
 	"github.com/openconfig/ondatra"
 	"github.com/openconfig/ondatra/binding/introspect"
 	"google.golang.org/grpc"
@@ -58,8 +59,14 @@ func TestGNMIClient(t *testing.T) {
 	dut := ondatra.DUT(t, "dut")
 	conn := dialConn(t, dut, introspect.GNMI, 9339)
 	c := gpb.NewGNMIClient(conn)
-	if _, err := c.Get(context.Background(), &gpb.GetRequest{Encoding: gpb.Encoding_JSON_IETF, Path: []*gpb.Path{{Elem: []*gpb.PathElem{}}}}); err != nil {
-		t.Fatalf("gnmi.Get failed: %v", err)
+	if deviations.GnmiGetRequiresConfigType(dut) {
+		if _, err := c.Get(context.Background(), &gpb.GetRequest{Encoding: gpb.Encoding_JSON_IETF, Path: []*gpb.Path{{Elem: []*gpb.PathElem{}}}, Type: gpb.GetRequest_CONFIG}); err != nil {
+			t.Fatalf("gnmi.Get failed: %v", err)
+		}
+	} else {
+		if _, err := c.Get(context.Background(), &gpb.GetRequest{Encoding: gpb.Encoding_JSON_IETF, Path: []*gpb.Path{{Elem: []*gpb.PathElem{}}}}); err != nil {
+			t.Fatalf("gnmi.Get failed: %v", err)
+		}
 	}
 }
 

diff --git a/feature/system/tests/system_base_test/metadata.textproto b/feature/system/tests/system_base_test/metadata.textproto
@@ -11,5 +11,6 @@ platform_exceptions:  {
   }
   deviations:  {
     cli_takes_precedence_over_oc:  true
+    gnmi_get_requires_config_type: true
   }
 }
diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -1171,3 +1171,6 @@ func EthChannelIngressParametersUnsupported(dut *ondatra.DUTDevice) bool {
 func EthChannelAssignmentCiscoNumbering(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetEthChannelAssignmentCiscoNumbering()
 }
+func GnmiGetRequiresConfigType(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetGnmiGetRequiresConfigType()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -623,7 +623,12 @@ message Metadata {
     bool eth_channel_assignment_cisco_numbering = 223;
     // Devices needs time to update interface counters.
     bool interface_counters_update_delayed = 224;
+    // gnmi_get_requires_config_type is set to true for devices that require type to be specified as config
+    // in default it will be false
+    // Juniper: b/361547597
+    bool gnmi_get_requires_config_type = 225;
     // 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