Merge pull request #21 from ythadhani/nokia-master

Allow setting YEmpty type and minor update to processing extensions.
nokia · Nov 9, 2022 · d79e2a8 · d79e2a8
2 parents 098c5f0 + 4d42f01
commit d79e2a8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/yext/extensions.go b/yext/extensions.go
@@ -12,7 +12,7 @@ type ExtensionParams struct {
 	Keyword, Argument string
 }
 
-func ProcessExtensions(value interface{}, extensions string, extHandler ExtensionHandler) (interface{}, error) {
+func GetSupportedExtensions(extensions string, extHandler ExtensionHandler) []ExtensionParams {
 	extSlice := strings.Split(extensions, ";")
 	var extensionList []ExtensionParams = []ExtensionParams{}
 	for _, ext := range extSlice {
@@ -27,8 +27,5 @@ func ProcessExtensions(value interface{}, extensions string, extHandler Extensio
 			extensionList = append(extensionList, extension)
 		}
 	}
-	if len(extensionList) > 0 {
-		return extHandler.Process(extensionList, value)
-	}
-	return value, nil
+	return extensionList
 }
diff --git a/ygot/render.go b/ygot/render.go
@@ -1184,10 +1184,13 @@ func structJSON(s GoStruct, parentMod string, args jsonOutputConfig) (map[string
 		}
 
 		if extensions, hasExtensions := fType.Tag.Lookup("extensions"); hasExtensions && args.extHandler != nil {
-			value, err = yext.ProcessExtensions(value, extensions, args.extHandler)
-			if err != nil {
-				errs.Add(err)
-				continue
+			supportedExtensions := yext.GetSupportedExtensions(extensions, args.extHandler)
+			if len(supportedExtensions) > 0 {
+				value, err = args.extHandler.Process(supportedExtensions, value)
+				if err != nil {
+					errs.Add(fmt.Errorf("failed to process YANG extensions: %s, error: %s", supportedExtensions, err.Error()))
+					continue
+				}
 			}
 		}
 

diff --git a/ytypes/container.go b/ytypes/container.go
@@ -209,11 +209,12 @@ func unmarshalStruct(schema *yang.Entry, parent interface{}, jsonTree map[string
 			return err
 		}
 
-		if extensions, hasExtensions := ft.Tag.Lookup("extensions"); hasExtensions {
-			if unmarshalConf.extHandler != nil {
-				jsonValue, err = yext.ProcessExtensions(jsonValue, extensions, unmarshalConf.extHandler)
+		if extensions, hasExtensions := ft.Tag.Lookup("extensions"); hasExtensions && unmarshalConf.extHandler != nil {
+			supportedExtensions := yext.GetSupportedExtensions(extensions, unmarshalConf.extHandler)
+			if len(supportedExtensions) > 0 {
+				jsonValue, err = unmarshalConf.extHandler.Process(supportedExtensions, jsonValue)
 				if err != nil {
-					return err
+					return fmt.Errorf("failed to process YANG extensions: %s, error: %s", supportedExtensions, err.Error())
 				}
 			}
 		}

diff --git a/ytypes/leaf.go b/ytypes/leaf.go
@@ -772,7 +772,7 @@ func sanitizeGNMI(parent interface{}, schema *yang.Entry, fieldName string, tv *
 	}
 
 	switch ykind {
-	case yang.Ybool:
+	case yang.Ybool, yang.Yempty:
 		return tv.GetBoolVal(), nil
 	case yang.Ystring:
 		return tv.GetStringVal(), nil
@@ -833,6 +833,11 @@ func gNMIToYANGTypeMatches(ykind yang.TypeKind, tv *gpb.TypedValue, jsonToleranc
 	switch ykind {
 	case yang.Ybool:
 		_, ok = tv.GetValue().(*gpb.TypedValue_BoolVal)
+	case yang.Yempty:
+		b, isBoolVal := tv.GetValue().(*gpb.TypedValue_BoolVal)
+		if isBoolVal {
+			ok = b.BoolVal
+		}
 	case yang.Ystring, yang.Yenum, yang.Yidentityref:
 		_, ok = tv.GetValue().(*gpb.TypedValue_StringVal)
 	case yang.Yint8, yang.Yint16, yang.Yint32, yang.Yint64: