convert values written via the Set RPC

Author: karimra

client/cmd/datastore_create.go

@@ -7,8 +7,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"os"
 
+	"github.com/iptecharch/data-server/pkg/datastore"
 	sdcpb "github.com/iptecharch/sdc-protos/sdcpb"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/prototext"
@@ -96,7 +98,7 @@ func init() {
 
 	datastoreCreateCmd.Flags().StringVarP(&target, "target", "", "", "target definition file")
 	datastoreCreateCmd.Flags().StringVarP(&syncFile, "sync", "", "", "target sync definition file")
-	datastoreCreateCmd.Flags().StringVarP(&owner, "owner", "", "", "candidate owner")
-	datastoreCreateCmd.Flags().Int32VarP(&priority, "priority", "", 0, "candidate priority")
+	datastoreCreateCmd.Flags().StringVarP(&owner, "owner", "", datastore.DefaultOwner, "candidate owner")
+	datastoreCreateCmd.Flags().Int32VarP(&priority, "priority", "", math.MaxInt32, "candidate priority")
 
 }

pkg/datastore/data_rpc.go

@@ -24,6 +24,11 @@ import (
 	"github.com/iptecharch/data-server/pkg/utils"
 )
 
+const (
+	// to be used for candidates created without an owner
+	DefaultOwner = "__sdcio"
+)
+
 func (d *Datastore) Get(ctx context.Context, req *sdcpb.GetDataRequest, nCh chan *sdcpb.GetDataResponse) error {
 	defer close(nCh)
 	switch req.GetDatastore().GetType() {
@@ -484,6 +489,11 @@ func (d *Datastore) validateUpdate(ctx context.Context, upd *sdcpb.Update) error
 	if err != nil {
 		return err
 	}
+	// 2. convert value to its YANG type
+	upd.Value, err = convertTypedValueToYANGType(rsp.GetSchema(), upd.GetValue())
+	if err != nil {
+		return err
+	}
 	// 2. validate value
 	val, err := utils.GetSchemaValue(upd.GetValue())
 	if err != nil {
@@ -1280,15 +1290,19 @@ func (d *Datastore) convertTypedValueToProto(ctx context.Context, p *sdcpb.Path,
 	if err != nil {
 		return nil, err
 	}
+	return convertTypedValueToYANGType(rsp.GetSchema(), tv)
+}
+
+func convertTypedValueToYANGType(schemaElem *sdcpb.SchemaElem, tv *sdcpb.TypedValue) (*sdcpb.TypedValue, error) {
 	switch {
-	case rsp.GetSchema().GetContainer() != nil:
-		if rsp.GetSchema().GetContainer().IsPresence {
+	case schemaElem.GetContainer() != nil:
+		if schemaElem.GetContainer().IsPresence {
 			return &sdcpb.TypedValue{
 				Timestamp: tv.GetTimestamp(),
 				Value:     &sdcpb.TypedValue_JsonVal{JsonVal: nil},
 			}, nil
 		}
-	case rsp.GetSchema().GetLeaflist() != nil:
+	case schemaElem.GetLeaflist() != nil:
 		switch tv.Value.(type) {
 		case *sdcpb.TypedValue_LeaflistVal:
 			return tv, nil
@@ -1301,8 +1315,8 @@ func (d *Datastore) convertTypedValueToProto(ctx context.Context, p *sdcpb.Path,
 				},
 			},
 		}, nil
-	case rsp.GetSchema().GetField() != nil:
-		switch rsp.GetSchema().GetField().GetType().GetType() {
+	case schemaElem.GetField() != nil:
+		switch schemaElem.GetField().GetType().GetType() {
 		default:
 			return tv, nil
 		case "string", "identityref":

pkg/utils/value.go

@@ -71,8 +71,8 @@ func GetSchemaValue(updValue *sdcpb.TypedValue) (interface{}, error) {
 		value = updValue.GetBytesVal()
 	// case *sdcpb.TypedValue_DecimalVal:
 	// 	value = updValue.GetDecimalVal()
-	// case *sdcpb.TypedValue_FloatVal:
-	// 	value = updValue.GetFloatVal()
+	case *sdcpb.TypedValue_FloatVal:
+		value = updValue.GetFloatVal()
 	// case *sdcpb.TypedValue_DoubleVal:
 	// 	value = updValue.GetDoubleVal()
 	case *sdcpb.TypedValue_IntVal: