* Support of yangmodels supported, see test_yangmodels.sh
* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf. * Ignore CR(\r) in yang files for DOS files
This commit is contained in:
parent
c7e847cd24
commit
207858e20d
26 changed files with 635 additions and 256 deletions
|
|
@ -106,7 +106,7 @@ main(int argc, char **argv)
|
|||
char *plugin = NULL;
|
||||
char *cmd = NULL;
|
||||
yang_spec *yspec = NULL;
|
||||
char *yangmodule = NULL;
|
||||
char *yangfilename = NULL;
|
||||
char *dbdir = NULL;
|
||||
int ret;
|
||||
int pid;
|
||||
|
|
@ -151,7 +151,7 @@ main(int argc, char **argv)
|
|||
case 'y': /* Yang file */
|
||||
if (!optarg)
|
||||
usage(argv0);
|
||||
yangmodule = optarg;
|
||||
yangfilename = optarg;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
|
|
@ -173,8 +173,8 @@ main(int argc, char **argv)
|
|||
clicon_err(OE_DB, 0, "Missing dbdir -b option");
|
||||
goto done;
|
||||
}
|
||||
if (yangmodule == NULL){
|
||||
clicon_err(OE_YANG, 0, "Missing yang module -m option");
|
||||
if (yangfilename == NULL){
|
||||
clicon_err(OE_YANG, 0, "Missing yang filename -y option");
|
||||
goto done;
|
||||
}
|
||||
/* Load datastore plugin */
|
||||
|
|
@ -187,7 +187,7 @@ main(int argc, char **argv)
|
|||
if ((yspec = yspec_new()) == NULL)
|
||||
goto done;
|
||||
/* Parse yang spec from given file */
|
||||
if (yang_parse(h, yangmodule, NULL, NULL, yspec) < 0)
|
||||
if (yang_spec_parse_file(h, yangfilename, yspec) < 0)
|
||||
goto done;
|
||||
/* Set database directory option */
|
||||
if (xmldb_setopt(h, "dbdir", dbdir) < 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue