Merge pull request #93 from iptecharch/convert-tv-set-rpc

convert values written via the Set RPC

Author: karimra

client/cmd/datastore_create.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"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 +97,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", "", 1, "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 {
@@ -1282,15 +1292,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
@@ -1303,8 +1317,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/datastore/datastore_rpc.go

@@ -262,6 +262,15 @@ func (d *Datastore) Discard(ctx context.Context, req *sdcpb.DiscardRequest) erro
 }
 
 func (d *Datastore) CreateCandidate(ctx context.Context, ds *sdcpb.DataStore) error {
+	if ds.GetPriority() < 0 {
+		return fmt.Errorf("invalid priority value must be >0")
+	}
+	if ds.GetPriority() <= 0 {
+		ds.Priority = 1
+	}
+	if ds.GetOwner() == "" {
+		ds.Owner = DefaultOwner
+	}
 	return d.cacheClient.CreateCandidate(ctx, d.Name(), ds.GetName(), ds.GetOwner(), ds.GetPriority())
 }
 

pkg/server/datastore.go

@@ -3,6 +3,8 @@ package server
 import (
 	"context"
 	"fmt"
+	"math"
+	"strings"
 	"time"
 
 	sdcpb "github.com/iptecharch/sdc-protos/sdcpb"
@@ -52,7 +54,11 @@ func (s *Server) GetDataStore(ctx context.Context, req *sdcpb.GetDataStoreReques
 func (s *Server) CreateDataStore(ctx context.Context, req *sdcpb.CreateDataStoreRequest) (*sdcpb.CreateDataStoreResponse, error) {
 	log.Debugf("Received CreateDataStoreRequest: %v", req)
 	name := req.GetName()
-	if name == "" {
+	lName := len(name)
+	if lName == 0 {
+		return nil, status.Error(codes.InvalidArgument, "missing datastore name attribute")
+	}
+	if lName > math.MaxUint16 {
 		return nil, status.Error(codes.InvalidArgument, "missing datastore name attribute")
 	}
 	switch {
@@ -66,6 +72,17 @@ func (s *Server) CreateDataStore(ctx context.Context, req *sdcpb.CreateDataStore
 		}
 		switch req.GetDatastore().GetType() {
 		case sdcpb.Type_CANDIDATE:
+			owner := req.GetDatastore().GetOwner()
+			lOwner := len(owner)
+			if lOwner == 0 {
+				return nil, status.Error(codes.InvalidArgument, "missing owner name attribute")
+			}
+			if lOwner > math.MaxUint16 {
+				return nil, status.Errorf(codes.InvalidArgument, "owner name too long(%d>%d)", lOwner, math.MaxUint16)
+			}
+			if strings.HasPrefix(owner, "__") {
+				return nil, status.Error(codes.InvalidArgument, "owner name cannot start with `__`")
+			}
 			err := ds.CreateCandidate(ctx, req.GetDatastore())
 			if err != nil {
 				return nil, status.Errorf(codes.Internal, "%v", err)
@@ -310,13 +327,5 @@ func (s *Server) datastoreToRsp(ctx context.Context, ds *datastore.Datastore) (*
 		Vendor:  ds.Config().Schema.Vendor,
 		Version: ds.Config().Schema.Version,
 	}
-	// for _, cand := range cands {
-	// 	rsp.Datastore = append(rsp.Datastore,
-	// 		&sdcpb.DataStore{
-	// 			Type: *sdcpb.Type_CANDIDATE.Enum(),
-	// 			Name: cand,
-	// 		},
-	// 	)
-	// }
 	return rsp, nil
 }

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: