Fix origin handling for compare paths (#795)

openconfig · Mar 22, 2023 · 0259101 · 0259101
1 parent dba644f
commit 0259101
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/util/gnmi.go b/util/gnmi.go
@@ -275,7 +275,7 @@ const (
 // ComparePaths returns the set relation between two paths.
 // It returns an error if the paths are invalid or not one of the relations.
 func ComparePaths(a, b *gpb.Path) CompareRelation {
-	if a.Origin != b.Origin {
+	if equivalentOrigin := a.Origin == b.Origin || (a.Origin == "" && b.Origin == "openconfig") || (a.Origin == "openconfig" && b.Origin == ""); !equivalentOrigin {
 		return Disjoint
 	}
 

diff --git a/util/gnmi_test.go b/util/gnmi_test.go
@@ -1083,6 +1083,16 @@ func TestComparePaths(t *testing.T) {
 		a:    mustStringToPath(t, "/foo[a=1][b=2]"),
 		b:    mustStringToPath(t, "/foo[a=1][b=3]"),
 		want: util.Disjoint,
+	}, {
+		desc: "origin a openconfig and origin b blank",
+		a:    &gpb.Path{Origin: "openconfig"},
+		b:    &gpb.Path{Origin: ""},
+		want: util.Equal,
+	}, {
+		desc: "origin a blank and origin b openconfig",
+		a:    &gpb.Path{Origin: ""},
+		b:    &gpb.Path{Origin: "openconfig"},
+		want: util.Equal,
 	}, {
 		desc: "equal paths",
 		a:    mustStringToPath(t, "/foo"),