Skip to content

Commit

Permalink
Fixed: [CLI: default format text | display](#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
olofhagsand committed Dec 9, 2024
1 parent ec84407 commit b2b83e4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Expected: January 2025

### Corrected Bugs

* Fixed: [CLI: default format text | display](https://github.com/clicon/clixon-controller/issues/165)
* Fixed: [CLI: Don't show <created>...</created> tags by default](https://github.com/clicon/clixon-controller/issues/110)
* Fixed: [YANG domains: issues if devices in different domains have identical schemas](https://github.com/clicon/clixon-controller/issues/170)
* Fixed: [Generalize default autocli.xml file](https://github.com/clicon/clixon-controller/issues/163)
Expand Down
2 changes: 1 addition & 1 deletion src/controller_configure.cli
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rollback("Discard edits (rollback 0)"), discard_changes();

show("Show a particular state of the system"), @datamodelshow, cli_show_auto_mode("candidate", "default", true, false);{
@|pipe_show, cli_show_auto_mode("candidate", "xml", true, false);
@datamodelshow, cli_show_auto_devs("candidate", "default", true, false, "explicit", "set ", true);
@datamodelshow, cli_show_auto_devs("candidate", "pipe-xml-default", true, false, "explicit", "set ", true);
compare("Compare candidate and running databases"), compare_dbs_rpc("running", "candidate", "default");{
xml("Show comparison in xml"), compare_dbs_rpc("running", "candidate","xml");
text("Show comparison in text"), compare_dbs_rpc("running", "candidate", "text");
Expand Down
4 changes: 2 additions & 2 deletions src/controller_operation.cli
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ show("Show a particular state of the system"){
}
configuration("Show configuration"), cli_show_auto_mode("running", "default", true, false);{
@|pipe_show, cli_show_auto_mode("running", "xml", true, false);
@datamodelshow, cli_show_auto_devs("running", "default", true, false, "explicit", "set ", true);
@datamodelshow, cli_show_auto_devs("running", "pipe-xml-default", true, false, "explicit", "set ", true);
}
connections("Show state of connection to devices")[
(<name:string>("device pattern")|
Expand Down Expand Up @@ -79,7 +79,7 @@ show("Show a particular state of the system"){
}
state("Show configuration and state"), cli_show_auto_mode("running", "default", true, true);{
@|pipe_show, cli_show_auto_mode("running", "xml", true, true);
@datamodelstate, cli_show_auto_devs("running", "default", true, true, "explicit", "set ", true);
@datamodelstate, cli_show_auto_devs("running", "pipe-xml-default", true, true, "explicit", "set ", true);
}
memory("Show memory usage"), cli_show_statistics("all");{
cli, cli_show_statistics("cli");{
Expand Down
2 changes: 1 addition & 1 deletion test/test-c-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ fi
# When pulled configs arrive, they are commited into tmpdev and committed into running
# Have to draw,...

exit
# exit

# Restart backend and ensure attributes remain
if $BE; then
Expand Down

0 comments on commit b2b83e4

Please sign in to comment.