Skip to content

fix issue #363 mismatch xml values while deleting multiple key config #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steiler merged 2 commits into from
Jan 14, 2026
+107 −0
Merged

fix issue #363 mismatch xml values while deleting multiple key config #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4a991
fix issue #363 mismatch xml values while deleting multiple key config
francoisdeturenne Nov 10, 2025
d35bfef
sort keys in xmlAddKeyElements and not in GetSchemaKeys
francoisdeturenne Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/tree/xml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"cmp"
"fmt"
"slices"
"sort"

"github.com/beevik/etree"
"github.com/sdcio/data-server/pkg/utils"
Expand Down Expand Up @@ -274,6 +275,9 @@ func xmlAddKeyElements(s Entry, parent *etree.Element) {

// from the parent we get the keys as slice
schemaKeys := parentSchema.GetSchemaKeys()
//issue #364: sort the slice
sort.Strings(schemaKeys)

var treeElem Entry = s
// the keys do match the levels up in the tree in reverse order
// hence we init i with levelUp and count down
Expand Down
103 changes: 103 additions & 0 deletions pkg/tree/xml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,109 @@ func TestToXMLTable(t *testing.T) {
useOperationRemove: true,
newConfig: nil,
},
{
name: "XML - delete multi key item (static route)",
onlyNewOrUpdated: true,
existingConfig: func(ctx context.Context, converter *utils.Converter) ([]*sdcpb.Update, error) {
// Create initial config with static routes
updates := []*sdcpb.Update{
{
Path: &sdcpb.Path{
Elem: []*sdcpb.PathElem{
{Name: "ipv6"},
{Name: "static-route", Key: map[string]string{
"owner": "owner-service1",
"ipv6-prefix": "prefix-2001:db8::/32",
"next-hop": "nexthop-2001:db8::1",
}},
{Name: "bfd-enabled"},
},
},
Value: &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: true}},
},
{
Path: &sdcpb.Path{
Elem: []*sdcpb.PathElem{
{Name: "ipv6"},
{Name: "static-route", Key: map[string]string{
"owner": "owner-service2",
"ipv6-prefix": "prefix-2001:db8:1::/48",
"next-hop": "nexthop-2001:db8::2",
}},
{Name: "bfd-enabled"},
},
},
Value: &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: false}},
},
}
return updates, nil
},
runningConfig: func(ctx context.Context, converter *utils.Converter) ([]*sdcpb.Update, error) {
// Same as existing config for this test
updates := []*sdcpb.Update{
{
Path: &sdcpb.Path{
Elem: []*sdcpb.PathElem{
{Name: "ipv6"},
{Name: "static-route", Key: map[string]string{
"owner": "owner-service1",
"ipv6-prefix": "prefix-2001:db8::/32",
"next-hop": "nexthop-2001:db8::1",
}},
{Name: "bfd-enabled"},
},
},
Value: &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: true}},
},
{
Path: &sdcpb.Path{
Elem: []*sdcpb.PathElem{
{Name: "ipv6"},
{Name: "static-route", Key: map[string]string{
"owner": "owner-service2",
"ipv6-prefix": "prefix-2001:db8:1::/48",
"next-hop": "nexthop-2001:db8::2",
}},
{Name: "bfd-enabled"},
},
},
Value: &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: false}},
},
}
return updates, nil
},
newConfig: func(ctx context.Context, converter *utils.Converter) ([]*sdcpb.Update, error) {
// Only keep one static route, delete the other
updates := []*sdcpb.Update{
{
Path: &sdcpb.Path{
Elem: []*sdcpb.PathElem{
{Name: "ipv6"},
{Name: "static-route", Key: map[string]string{
"owner": "owner-service2",
"ipv6-prefix": "prefix-2001:db8:1::/48",
"next-hop": "nexthop-2001:db8::2",
}},
{Name: "bfd-enabled"},
},
},
Value: &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: false}},
},
}
return updates, nil
},
expected: `<ipv6>
<static-route operation="delete">
<ipv6-prefix>prefix-2001:db8::/32</ipv6-prefix>
<next-hop>nexthop-2001:db8::1</next-hop>
<owner>owner-service1</owner>
</static-route>
</ipv6>
`,
honorNamespace: false,
operationWithNamespace: false,
useOperationRemove: false,
},
}

for _, tt := range tests {
Expand Down
Loading