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

fixed empty cli gen err

Browse source
This commit is contained in:
Olof hagsand 2017-07-27 12:09:57 +02:00
parent 5ae1aeb427
commit fd2a5db31b
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,7 +3,6 @@
## Upcoming 3.3.2 ## Upcoming 3.3.2
### Known issues ### Known issues
* Error in CLI generated code for Yang empty types
### Major changes: ### Major changes:
* Added support for YANG anyxml. * Added support for YANG anyxml.

7
apps/cli/cli_generate.c
View file

@ -348,6 +348,12 @@ yang2cli_var(clicon_handle h,
&options, &mincv, &maxcv, &pattern, &fraction_digits) < 0) &options, &mincv, &maxcv, &pattern, &fraction_digits) < 0)
goto done; goto done;
restype = yrestype?yrestype->ys_argument:NULL; restype = yrestype?yrestype->ys_argument:NULL;
if (restype && strcmp(restype, "empty") == 0){
retval = 0;
goto done;
}
if (clicon_type2cv(type, restype, &cvtype) < 0) if (clicon_type2cv(type, restype, &cvtype) < 0)
goto done; goto done;
@ -389,7 +395,6 @@ yang2cli_var(clicon_handle h,
cprintf(cb0, ")"); cprintf(cb0, ")");
} }
} }
retval = 0; retval = 0;
done: done:
return retval; return retval;

2
test/test_yang.sh
View file

@ -101,7 +101,7 @@ new "netconf get (should be some)"
expecteof "$clixon_netconf -qf $clixon_cf -y /tmp/test.yang" "<rpc><get><filter type=\"xpath\" select=\"/\"/></get></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>1</a><b>2</b><c>5</c></y><d/></x></data></rpc-reply>]]>]]>$" expecteof "$clixon_netconf -qf $clixon_cf -y /tmp/test.yang" "<rpc><get><filter type=\"xpath\" select=\"/\"/></get></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>1</a><b>2</b><c>5</c></y><d/></x></data></rpc-reply>]]>]]>$"
new "cli set leaf-list" new "cli set leaf-list"
expectfn "$clixon_cli -D 1 -1f $clixon_cf -y /tmp/test.yang set x f e foo" "" expectfn "$clixon_cli -1f $clixon_cf -y /tmp/test.yang set x f e foo" ""
new "cli show leaf-list" new "cli show leaf-list"
expectfn "$clixon_cli -1f $clixon_cf -y /tmp/test.yang show xpath /x/f/e" "<e>foo</e>" expectfn "$clixon_cli -1f $clixon_cf -y /tmp/test.yang show xpath /x/f/e" "<e>foo</e>"