migrate conversion functions

go.sum

@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
 cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
+cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
+cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
 github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
 github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -183,6 +185,8 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
 github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/scrapli/scrapligo v1.3.3 h1:D9zj1QrOYNYAQ30YT7wfQBINvPGxvs5L5Lz+2LnL7V4=
 github.com/scrapli/scrapligo v1.3.3/go.mod h1:pOWxVyPsQRrWTrkoSSDg05tjOqtWfLffAZtAsCc0w3M=
@@ -232,6 +236,18 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6
 go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
 go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -274,6 +290,8 @@ golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
 golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
+golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

main.go

@@ -30,7 +30,6 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/sdcio/data-server/pkg/config"
 	"github.com/sdcio/data-server/pkg/server"
-	"github.com/sdcio/logger"
 	logf "github.com/sdcio/logger"
 	"github.com/spf13/pflag"
 )
@@ -61,10 +60,10 @@ func main() {
 		ReplaceAttr: logf.ReplaceTimeAttr,
 	}
 	if debug {
-		slogOpts.Level = slog.Level(-logger.VDebug)
+		slogOpts.Level = slog.Level(-logf.VDebug)
 	}
 	if trace {
-		slogOpts.Level = slog.Level(-logger.VTrace)
+		slogOpts.Level = slog.Level(-logf.VTrace)
 	}
 
 	log := logr.FromSlogHandler(slog.NewJSONHandler(os.Stdout, slogOpts))

pkg/datastore/converter_test.go

@@ -166,7 +166,7 @@ func TestDatastore_expandUpdateLeafAsKeys(t *testing.T) {
 								Name: "doublekey",
 								Key: map[string]string{
 									"key1": "foo",
-									"key2": "bar",
+									"key2": "123",
 								},
 							},
 							{
@@ -187,7 +187,7 @@ func TestDatastore_expandUpdateLeafAsKeys(t *testing.T) {
 								Name: "doublekey",
 								Key: map[string]string{
 									"key1": "foo",
-									"key2": "bar",
+									"key2": "123",
 								},
 							},
 							{
@@ -206,7 +206,7 @@ func TestDatastore_expandUpdateLeafAsKeys(t *testing.T) {
 								Name: "doublekey",
 								Key: map[string]string{
 									"key1": "foo",
-									"key2": "bar",
+									"key2": "123",
 								},
 							},
 							{
@@ -215,7 +215,7 @@ func TestDatastore_expandUpdateLeafAsKeys(t *testing.T) {
 						},
 					},
 					Value: &sdcpb.TypedValue{
-						Value: &sdcpb.TypedValue_StringVal{StringVal: "bar"},
+						Value: &sdcpb.TypedValue_StringVal{StringVal: "123"},
 					},
 				},
 			},

pkg/datastore/target/netconf/xml2SchemapbAdapter.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/beevik/etree"
 	schemaClient "github.com/sdcio/data-server/pkg/datastore/clients/schema"
-	"github.com/sdcio/data-server/pkg/utils"
 	logf "github.com/sdcio/logger"
 	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
@@ -123,7 +122,7 @@ func (x *XML2sdcpbConfigAdapter) transformContainer(ctx context.Context, e *etre
 		if cPElem[len(cPElem)-1].Key == nil {
 			cPElem[len(cPElem)-1].Key = map[string]string{}
 		}
-		tv, err := utils.Convert(ctx, e.FindElement("./"+ls.Name).Text(), ls.Type)
+		tv, err := sdcpb.TVFromString(ls.Type, e.FindElement("./"+ls.Name).Text(), 0)
 		if err != nil {
 			return err
 		}
@@ -209,7 +208,7 @@ func (x *XML2sdcpbConfigAdapter) transformField(ctx context.Context, e *etree.El
 	}
 
 	// process terminal values
-	tv, err := utils.Convert(ctx, e.Text(), schemaLeafType)
+	tv, err := sdcpb.TVFromString(schemaLeafType, e.Text(), 0)
 	if err != nil {
 		return fmt.Errorf("unable to convert value [%s] at path [%s] according to SchemaLeafType [%+v]: %w", e.Text(), e.GetPath(), schemaLeafType, err)
 	}
@@ -244,7 +243,7 @@ func (x *XML2sdcpbConfigAdapter) transformLeafList(ctx context.Context, e *etree
 	// process terminal values
 	data := strings.TrimSpace(e.Text())
 
-	tv, err := utils.Convert(ctx, data, slt)
+	tv, err := sdcpb.TVFromString(slt, data, 0)
 	if err != nil {
 		return fmt.Errorf("failed to convert value %s to type %s: %w", data, slt.Type, err)
 	}

pkg/tree/default_value.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/sdcio/data-server/pkg/tree/types"
-	"github.com/sdcio/data-server/pkg/utils"
 	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
 
@@ -28,7 +27,7 @@ func DefaultValueRetrieve(ctx context.Context, schema *sdcpb.SchemaElem, path *s
 		if defaultVal == "" {
 			return nil, fmt.Errorf("no defaults defined for schema path: %s", path.ToXPath(false))
 		}
-		tv, err = utils.Convert(ctx, defaultVal, schem.Field.GetType())
+		tv, err = sdcpb.TVFromString(schem.Field.GetType(), defaultVal, 0)
 		if err != nil {
 			return nil, err
 		}
@@ -39,7 +38,7 @@ func DefaultValueRetrieve(ctx context.Context, schema *sdcpb.SchemaElem, path *s
 		}
 		tvlist := make([]*sdcpb.TypedValue, 0, len(listDefaults))
 		for _, dv := range schem.Leaflist.GetDefaults() {
-			tvelem, err := utils.Convert(ctx, dv, schem.Leaflist.GetType())
+			tvelem, err := sdcpb.TVFromString(schem.Leaflist.GetType(), dv, 0)
 			if err != nil {
 				return nil, fmt.Errorf("error converting default to typed value for %s, type: %s ; value: %s; err: %v", path.ToXPath(false), schem.Leaflist.GetType().GetTypeName(), dv, err)
 			}

pkg/tree/importer/xml/xml_tree_importer.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/beevik/etree"
 	"github.com/sdcio/data-server/pkg/tree/importer"
-	"github.com/sdcio/data-server/pkg/utils"
 	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
 
@@ -51,7 +50,7 @@ func (x *XmlTreeImporter) GetKeyValue() (string, error) {
 }
 
 func (x *XmlTreeImporter) GetTVValue(ctx context.Context, slt *sdcpb.SchemaLeafType) (*sdcpb.TypedValue, error) {
-	return utils.Convert(ctx, x.elem.Text(), slt)
+	return sdcpb.TVFromString(slt, x.elem.Text(), 0)
 }
 
 func (x *XmlTreeImporter) GetName() string {

pkg/tree/json_test.go

@@ -75,7 +75,7 @@ func TestToJsonTable(t *testing.T) {
       "type": "default"
     }
   ],
-  "patterntest": "foo"
+  "patterntest": "hallo 00"
 }`,
 		},
 		{
@@ -87,7 +87,7 @@ func TestToJsonTable(t *testing.T) {
 				return expandUpdateFromConfig(ctx, c, converter)
 			},
 			expected: `{
-  "sdcio_model:patterntest": "foo",
+  "sdcio_model:patterntest": "hallo 00",
   "sdcio_model_choice:choices": {
     "case1": {
       "case-elem": {
@@ -194,7 +194,7 @@ func TestToJsonTable(t *testing.T) {
       "type": "ip-vrf"
     }
   ],
-  "patterntest": "bar"
+  "patterntest": "hallo 99"
 }`,
 		},
 		{
@@ -214,7 +214,7 @@ func TestToJsonTable(t *testing.T) {
 				return expandUpdateFromConfig(ctx, c, converter)
 			},
 			expected: `{
-  "sdcio_model:patterntest": "bar",
+  "sdcio_model:patterntest": "hallo 99",
   "sdcio_model_if:interface": [
     {
       "admin-state": "enable",
@@ -487,7 +487,7 @@ func config1() *sdcio_schema.Device {
 				"bar",
 			},
 		},
-		Patterntest: ygot.String("foo"),
+		Patterntest: ygot.String("hallo 00"),
 		NetworkInstance: map[string]*sdcio_schema.SdcioModel_NetworkInstance{
 			"default": {
 				AdminState:  sdcio_schema.SdcioModelNi_AdminState_disable,
@@ -515,7 +515,7 @@ func config2() *sdcio_schema.Device {
 				},
 			},
 		},
-		Patterntest: ygot.String("bar"),
+		Patterntest: ygot.String("hallo 99"),
 		NetworkInstance: map[string]*sdcio_schema.SdcioModel_NetworkInstance{
 			"other": {
 				AdminState:  sdcio_schema.SdcioModelNi_AdminState_enable,