Skip to content

Allow for deviate add of extensions #304

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

Open
sengleung wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow for deviate add of extensions #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/yang/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,10 @@ func (e *Entry) ApplyDeviate(deviateOpts ...DeviateOpt) []error {
deviatedNode.Extra["must"] = append(deviatedNode.Extra["must"], musts...)
}

if len(devSpec.Exts) > 0 {
deviatedNode.Exts = append(deviatedNode.Exts, devSpec.Exts...)
}

case DeviationNotSupported:
dp := deviatedNode.Parent
if dp == nil {
Expand Down
42 changes: 42 additions & 0 deletions pkg/yang/entry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3658,6 +3658,43 @@ func TestDeviation(t *testing.T) {
},
},
},
}, {
desc: "deviate add extension",
inFiles: map[string]string{
"module": `
module test-deviate-add-extension {
prefix "a";
namespace "urn:a";

container foo {
leaf bar {
type string;
ext:extension1 "extension 1";
}
}
deviation /foo/bar {
deviate add {
ext:extension2;
ext:extension3 "extension 3";
}
}
}`,
},
wants: map[string][]deviationTest{
"test-deviate-add-extension": {
{
path: "/a:foo/a:bar",
entry: &Entry{
Name: "mode",
Exts: []*Statement{
{Keyword: "ext:extension1", HasArgument: true, Argument: "extension 1"},
{Keyword: "ext:extension2"},
{Keyword: "ext:extension3", HasArgument: true, Argument: "extension 3"},
},
},
},
},
},
}}

for _, tt := range tests {
Expand Down Expand Up @@ -3769,6 +3806,11 @@ func TestDeviation(t *testing.T) {
if MustDiff != "" {
t.Errorf("Must deviation mismatch (-want +got):\n%s", MustDiff)
}

if extsDiff := cmp.Diff(want.entry.Exts, got.Exts,
cmpopts.IgnoreUnexported(Statement{})); extsDiff != "" {
t.Errorf("Exts mismatch (-want +got):\n%s", extsDiff)
}
}
}
})
Expand Down