fix sorting of keys, implement better handling of identityref

Author: alexandernorth

pkg/datastore/target/netconf/xml2SchemapbAdapter.go

@@ -124,7 +124,13 @@ func (x *XML2sdcpbConfigAdapter) transformContainer(ctx context.Context, e *etre
 		if cPElem[len(cPElem)-1].Key == nil {
 			cPElem[len(cPElem)-1].Key = map[string]string{}
 		}
-		cPElem[len(cPElem)-1].Key[ls.Name] = e.FindElement("./" + ls.Name).Text()
+		tv, err := utils.Convert(e.FindElement("./"+ls.Name).Text(), ls.Type)
+		if err != nil {
+			return err
+		}
+		keyValue := utils.TypedValueToString(tv)
+
+		cPElem[len(cPElem)-1].Key[ls.Name] = keyValue
 	}
 
 	ntc := NewTransformationContext(cPElem)

pkg/tree/sharedEntryAttributes.go

@@ -1659,18 +1659,18 @@ func (s *sharedEntryAttributes) getKeyName() (string, error) {
 		return "", fmt.Errorf("error %s is a schema element, can only get KeyNames for key element", strings.Join(s.Path(), " "))
 	}
 
-	// get ancestro schema
+	// get ancestor schema
 	ancestorWithSchema, levelUp := s.GetFirstAncestorWithSchema()
 
-	// only Contaieners have keys, so check for that
-	switch sch := ancestorWithSchema.GetSchema().GetSchema().(type) {
-	case *sdcpb.SchemaElem_Container:
-		// return the name of the levelUp-1 key
-		return sch.Container.GetKeys()[levelUp-1].Name, nil
+	// only Containers have keys, so check for that
+	schemaKeys := ancestorWithSchema.GetSchemaKeys()
+	if len(schemaKeys) == 0 {
+		// we probably called the function on a LeafList or LeafEntry which is not a valid call to be made.
+		return "", fmt.Errorf("error LeafList and Field should not have keys %s", strings.Join(s.Path(), " "))
 	}
 
-	// we probably called the function on a LeafList or LeafEntry which is not a valid call to be made.
-	return "", fmt.Errorf("error LeafList and Field should not have keys %s", strings.Join(s.Path(), " "))
+	slices.Sort(schemaKeys)
+	return schemaKeys[levelUp-1], nil
 }
 
 func (s *sharedEntryAttributes) getOrCreateChilds(ctx context.Context, path types.PathSlice) (Entry, error) {

pkg/utils/converter.go

@@ -422,6 +422,8 @@ func TypedValueToYANGType(tv *sdcpb.TypedValue, schemaObject *sdcpb.SchemaElem)
 		return tv, nil
 	case *sdcpb.TypedValue_AnyVal:
 		return tv, nil
+	case *sdcpb.TypedValue_IdentityrefVal:
+		return ConvertToTypedValue(schemaObject, tv.GetStringVal(), tv.GetTimestamp())
 	}
 	return tv, nil
 }