Ignore default data values in findSetLeaves (#476)

* Ignore default data values in findSetLeaves
openconfig · Nov 24, 2020 · db98071 · db98071
1 parent b0419a6
commit db98071
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ygot/diff.go b/ygot/diff.go
@@ -263,7 +263,8 @@ func findSetLeaves(s GoStruct, opts ...DiffOpt) (map[*pathSpec]interface{}, erro
 
 		ni.Annotation = []interface{}{vp}
 
-		if util.IsNilOrInvalidValue(ni.FieldValue) || util.IsValueStructPtr(ni.FieldValue) || util.IsValueMap(ni.FieldValue) {
+		// Ignore non-data, or default data values.
+		if util.IsNilOrInvalidValue(ni.FieldValue) || util.IsValueNilOrDefault(ni.FieldValue.Interface()) || util.IsValueStructPtr(ni.FieldValue) || util.IsValueMap(ni.FieldValue) {
 			return
 		}
 

diff --git a/ygot/diff_test.go b/ygot/diff_test.go
@@ -151,6 +151,7 @@ type basicStruct struct {
 	StringValue *string                     `path:"string-value"`
 	StructValue *basicStructTwo             `path:"struct-value"`
 	MapValue    map[string]*basicListMember `path:"map-list"`
+	EmptyValue  YANGEmpty                   `path:"empty-value"`
 }
 
 func (*basicStruct) IsYANGGoStruct() {}
@@ -429,6 +430,16 @@ func TestFindSetLeaves(t *testing.T) {
 		desc:     "struct with fields missing path annotation",
 		inStruct: &errorStruct{Value: String("foo")},
 		wantErr:  "error from ForEachDataField iteration: field Value did not specify a path",
+	}, {
+		desc:     "struct with empty value",
+		inStruct: &basicStruct{EmptyValue: YANGEmpty(true)},
+		want: map[*pathSpec]interface{}{
+			{
+				gNMIPaths: []*gnmipb.Path{{
+					Elem: []*gnmipb.PathElem{{Name: "empty-value"}},
+				}},
+			}: YANGEmpty(true),
+		},
 	}, {
 		desc: "multi-level string values",
 		inStruct: &basicStruct{

diff --git a/ygot/render_test.go b/ygot/render_test.go
@@ -838,8 +838,9 @@ func (*renderExampleUnionEnum) IsRenderUnionExample() {}
 
 // renderExampleChild is a child of the renderExample struct.
 type renderExampleChild struct {
-	Val  *uint64  `path:"val"`
-	Enum EnumTest `path:"enum"`
+	Val   *uint64   `path:"val"`
+	Enum  EnumTest  `path:"enum"`
+	Empty YANGEmpty `path:"empty"`
 }
 
 // IsYANGGoStruct implements the GoStruct interface.