experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deleted obsolete fields in clixon-config.yang

Browse source
This commit is contained in:
Olof hagsand 2022-03-05 12:48:37 +01:00
parent 0a593cd513
commit dd4e2be25c
5 changed files with 34 additions and 1187 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -46,6 +46,17 @@ Expected: March 2022
Users may have to change how they access the system
* New `clixon-config@2022-02-11.yang` revision
* Added option:
* `CLICON_LOG_STRING_LIMIT`
* Removed (previosly marked) obsolete options:
* `CLICON_RESTCONF_PATH`
* `CLICON_RESTCONF_PRETTY`
* `CLICON_CLI_GENMODEL`
* `CLICON_CLI_GENMODEL_TYPE`
* `CLICON_CLI_GENMODEL_COMPLETION`
* `CLICON_CLI_AUTOCLI_EXCLUDE`
* `CLICON_CLI_MODEL_TREENAME`
* RESTCONF replies on the form: `{"data":...}` changed to: `{"ietf-restconf:data":...}`
* See [restconf GET json response does not encode top level node with namespace as per rfc #303](https://github.com/clicon/clixon/issues/303)
* YANG leafref `require-instance` default changed to `true`

16
apps/cli/cli_show.c
View file

@ -664,6 +664,10 @@ int cli_show_version(clicon_handle h,
}
/*! Generic show configuration CLIgen callback using generated CLI syntax
*
* This callback can be used only in context of an autocli generated syntax tree, such as:
* show @datamodel, cli_show_auto();
*
* @param[in] h CLICON handle
* @param[in] state If set, show both config and state, otherwise only config
* @param[in] cvv Vector of variables from CLIgen command-line
@ -678,10 +682,10 @@ int cli_show_version(clicon_handle h,
* @see cli_show_config1
*/
static int
cli_show_auto1(clicon_handle h,
int state,
cvec *cvv,
cvec *argv)
cli_show_generated(clicon_handle h,
int state,
cvec *cvv,
cvec *argv)
{
int retval = 1;
yang_stmt *yspec;
@ -816,7 +820,7 @@ cli_show_auto(clicon_handle h,
cvec *cvv,
cvec *argv)
{
return cli_show_auto1(h, 0, cvv, argv);
return cli_show_generated(h, 0, cvv, argv);
}
/*! Generic show config and state CLIgen callback using generated CLI syntax
@ -833,7 +837,7 @@ cli_show_auto_state(clicon_handle h,
cvec *cvv,
cvec *argv)
{
return cli_show_auto1(h, 1, cvv, argv);
return cli_show_generated(h, 1, cvv, argv);
}
/*! Show clixon configuration options as loaded

5
test/virtualbox/README.md Normal file
View file

@ -0,0 +1,5 @@
# Clixon virtualbox tests
Tests using Virtualbox for different platforms.

1103
yang/clixon/clixon-config@2021-11-11.yang
View file

File diff suppressed because it is too large Load diff

86
yang/clixon/clixon-config@2022-02-11.yang
View file

@ -50,6 +50,14 @@ module clixon-config {
description
"Added option:
CLICON_LOG_STRING_LIMIT
Removed (previosly marked) obsolete options:
CLICON_RESTCONF_PATH
CLICON_RESTCONF_PRETTY
CLICON_CLI_GENMODEL
CLICON_CLI_GENMODEL_TYPE
CLICON_CLI_GENMODEL_COMPLETION
CLICON_CLI_AUTOCLI_EXCLUDE
CLICON_CLI_MODEL_TREENAME
Released in Clixon 5.6";
}
revision 2021-12-05 {
@ -482,16 +490,6 @@ module clixon-config {
only loading from startup but may occur in other circumstances as well. This
means that sanity checks of erroneous XML/JSON may not be properly signalled.";
}
leaf CLICON_RESTCONF_PATH {
type string;
default "/www-data/fastcgi_restconf.sock";
description
"FastCGI unix socket. Should be specified in webserver
Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock
Only if with-restconf=fcgi, NOT native
Note: Obsolete, use fcgi-socket in clixon-restconf.yang instead";
status obsolete;
}
leaf CLICON_BACKEND_DIR {
type string;
description
@ -568,21 +566,6 @@ module clixon-config {
automatically updated.
If this option is false, the startup is autoamtically updated following the RFC";
}
leaf CLICON_RESTCONF_PRETTY {
type boolean;
default true;
description
"Restconf return value pretty print.
Restconf clients may add HTTP header:
Accept: application/yang-data+json, or
Accept: application/yang-data+xml
to get return value in XML or JSON.
RFC 8040 examples print XML and JSON in pretty-printed form.
Setting this value to false makes restconf return not pretty-printed
which may be desirable for performance or tests
Note: Obsolete, use pretty in clixon-restconf.yang instead";
status obsolete;
}
leaf CLICON_RESTCONF_USER {
type string;
description
@ -641,59 +624,6 @@ module clixon-config {
"Startup CLI mode. This should match a CLICON_MODE variable set in
one of the clispec files";
}
leaf CLICON_CLI_GENMODEL {
type int32;
default 1;
description
"0: Do not generate CLISPEC syntax for the auto-cli.
1: Generate a CLI specification for CLI completion of all loaded Yang modules.
This CLI tree can be accessed in CLI-spec files using the tree reference syntax (eg
@datamodel).
2: Same including state syntax in a tree called @datamodelstate and @datamodelshow
See also CLICON_CLI_MODEL_TREENAME.
Obsolete, use clixon-autocli.yang enable-autocli instead";
status obsolete;
}
leaf CLICON_CLI_MODEL_TREENAME {
type string;
default "datamodel";
description
"If CLICON_CLI_GENMODEL is set, CLI specs can reference the
model syntax using a model tree set by this option.
Three trees are generated with this name as a base, (assuming base is datamodel):
- @datamodel - a clispec for navigating in editing a configuration (set/merge/delete)
- @datamodelshow - a clispec for navigating in showing a configuration
- @datamodelstate - a clispec for navigating in showing a configuration WITH state
Example: set @datamodel, cli_set();
show @datamodelshow, cli_show_auto();
show state @datamodelstate, cli_show_auto_state();
Obsolete, use constant AUTOCLI_TREENAME instead;
";
status obsolete;
}
leaf CLICON_CLI_GENMODEL_COMPLETION {
type int32;
default 1;
description "Generate code for CLI completion of existing db symbols.
Obsolete, use autocli/completion-default instead";
status obsolete;
}
leaf CLICON_CLI_GENMODEL_TYPE {
type cli_genmodel_type;
default "VARS";
description "How to generate and show auto CLI syntax: VARS|ALL|HIDE|OC_COMPRESS";
}
leaf CLICON_CLI_AUTOCLI_EXCLUDE {
type string;
description
"List of module names that should not be generated autocli from
Example:
<CLICON_CLI_AUTOCLI_EXCLUDE>clixon-restconf</CLICON_CLI_AUTOCLI_EXCLUDE>
means generate autocli for all models except clixon-restconf.yang
The value can be a list of space separated module names
Obsolete, use autocli/exclude logic instead";
status obsolete;
}
leaf CLICON_CLI_VARONLY {
type int32;
default 1;