fixing json builder by adjusting value types

Author: steiler

pkg/datastore/data_rpc.go

@@ -799,7 +799,7 @@ func (d *Datastore) expandUpdates(ctx context.Context, updates []*sdcpb.Update,
 	return outUpdates, nil
 }
 
-func (d *Datastore) expandUpdateKeysAsLeaf(_ context.Context, upd *sdcpb.Update) ([]*sdcpb.Update, error) {
+func (d *Datastore) expandUpdateKeysAsLeaf(ctx context.Context, upd *sdcpb.Update) ([]*sdcpb.Update, error) {
 	upds := make([]*sdcpb.Update, 0)
 	// expand update path if it contains keys
 	for i, pe := range upd.GetPath().GetElem() {
@@ -822,7 +822,16 @@ func (d *Datastore) expandUpdateKeysAsLeaf(_ context.Context, upd *sdcpb.Update)
 				)
 			}
 			intUpd.Path.Elem = append(intUpd.Path.Elem, &sdcpb.PathElem{Name: k})
+
 			intUpd.Value = &sdcpb.TypedValue{Value: &sdcpb.TypedValue_StringVal{StringVal: v}}
+			schemaRsp, err := d._validationClientBound.GetSchema(ctx, upd.Path)
+			if err != nil {
+				return nil, err
+			}
+			intUpd.Value, err = d.typedValueToYANGType(upd.GetValue(), schemaRsp.GetSchema())
+			if err != nil {
+				return nil, err
+			}
 			upds = append(upds, intUpd)
 		}
 	}

pkg/datastore/datastore_rpc.go

@@ -675,30 +675,23 @@ func (d *Datastore) storeSyncMsg(ctx context.Context, syncup *target.SyncUpdate,
 				store = cachepb.Store_STATE
 			}
 		}
-		expandedUpds, err := d.expandUpdateKeysAsLeaf(ctx, upd)
+		// TODO:[KR] convert update typedValue if needed
+		cUpd, err := d.cacheClient.NewUpdate(upd)
 		if err != nil {
-			log.Errorf("datastore %s failed expanding Update keys as leafs %v: %v", d.config.Name, upd.GetPath(), err)
+			log.Errorf("datastore %s failed to create update from %v: %v", d.config.Name, upd, err)
 			continue
 		}
-		upds := append(expandedUpds, upd)
-		for _, expUpd := range upds {
-			// TODO:[KR] convert update typedValue if needed
-			cUpd, err := d.cacheClient.NewUpdate(expUpd)
-			if err != nil {
-				log.Errorf("datastore %s failed to create update from %v: %v", d.config.Name, upd, err)
-				continue
-			}
 
-			rctx, cancel := context.WithTimeout(ctx, time.Minute) // TODO:[KR] make this timeout configurable ?
-			defer cancel()
-			err = d.cacheClient.Modify(rctx, d.Config().Name, &cache.Opts{
-				Store: store,
-			}, nil, []*cache.Update{cUpd})
-			if err != nil {
-				log.Errorf("datastore %s failed to send modify request to cache: %v", d.config.Name, err)
-			}
+		rctx, cancel := context.WithTimeout(ctx, time.Minute) // TODO:[KR] make this timeout configurable ?
+		defer cancel()
+		err = d.cacheClient.Modify(rctx, d.Config().Name, &cache.Opts{
+			Store: store,
+		}, nil, []*cache.Update{cUpd})
+		if err != nil {
+			log.Errorf("datastore %s failed to send modify request to cache: %v", d.config.Name, err)
 		}
 	}
+
 }
 
 // helper for GetSchema

pkg/datastore/jbuilderv2/jsonbuilder.go

@@ -134,8 +134,10 @@ func convertKeyValue(value, valueType string) (interface{}, error) {
 	switch valueType {
 	case stringType:
 		return value, nil
-	case int8Type, int16Type, int32Type, uint8Type, uint16Type, uint32Type:
+	case int8Type, int16Type, int32Type:
 		return strconv.Atoi(value)
+	case uint8Type, uint16Type, uint32Type:
+		return strconv.ParseUint(value, 10, 64)
 	case floatType:
 		return strconv.ParseFloat(value, 64)
 	case boolType:
@@ -219,16 +221,11 @@ func (j *jsonBuilder) addValueToObject(obj map[string]any, path []*pathElem, val
 // the provided keys.
 func findOrCreateMatchingObject(arr []map[string]interface{}, keys map[string]*vt) (map[string]interface{}, bool, error) {
 	for _, obj := range arr {
-		match := true
 		for k, v := range keys {
-			if !reflect.DeepEqual(obj[k], v.conVal) {
-				match = false
-				break
+			if reflect.DeepEqual(obj[k], v.conVal) {
+				return obj, true, nil
 			}
 		}
-		if match {
-			return obj, true, nil
-		}
 	}
 
 	// No match found, create a new object