diff --git a/example/main/README.md b/example/main/README.md index e55d46eb..76f9eb02 100644 --- a/example/main/README.md +++ b/example/main/README.md @@ -141,11 +141,12 @@ server { ``` Start nginx daemon ``` -sudo /etc/init.d/nginx start + sudo /etc/init.d/nginx start + sudo systemctl start nginx.service # alternative using systemd ``` Start the clixon restconf daemon ``` -sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data + sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data ``` then access using curl or wget: ``` @@ -322,4 +323,4 @@ static clixon_plugin_api api = { .ca_suspend=NULL, /* cligen_susp_cb_t */ .ca_interrupt=NULL, /* cligen_interrupt_cb_t */ }; -``` \ No newline at end of file +``` diff --git a/example/main/example_backend.c b/example/main/example_backend.c index 8abfb297..ca4fecd7 100644 --- a/example/main/example_backend.c +++ b/example/main/example_backend.c @@ -542,7 +542,7 @@ clixon_plugin_init(clicon_handle h) struct timeval retention = {0,0}; int argc; /* command-line options (after --) */ char **argv; - char c; + int c; clicon_debug(1, "%s backend", __FUNCTION__); diff --git a/example/main/example_restconf.c b/example/main/example_restconf.c index 9a245d19..71bdd391 100644 --- a/example/main/example_restconf.c +++ b/example/main/example_restconf.c @@ -40,7 +40,6 @@ #include #include #include -#include /* cligen */ #include @@ -329,7 +328,7 @@ clixon_plugin_init(clicon_handle h) { int argc; /* command-line options (after --) */ char **argv = NULL; - char c; + int c; clicon_debug(1, "%s restconf", __FUNCTION__); /* Get user command-line options (after --) */ diff --git a/test/README.md b/test/README.md index 27349b26..d11a62ef 100644 --- a/test/README.md +++ b/test/README.md @@ -26,9 +26,11 @@ You need to build and install the clixon utility programs before running the tes sudo make install ``` -You need to start nginx for some of the text. There are instructions in +You need to configure and start nginx for the restconf tests: +* The [example](../example/main/README.md) has instructions on how to edit your nginx config files * If you run systemd: `sudo systemctl start nginx.service` -* The [example](../example/README.md) has instructions + +You may need to install the `time` utility (`/usr/bin/time`). ## Prefix variable @@ -65,7 +67,7 @@ You may add your site-specific modifications in a `site.sh` file. Example: # Add test to this list that you dont want run SKIPLIST="test_openconfig.sh test_yangmodels.sh" # Parse yang openconfig models from https://github.com/openconfig/public - OPENCONFIG=/home/olof/src/clixon/test/public + OPENCONFIG=/usr/local/share/openconfig/public # Parse yangmodels from https://github.com/YangModels/yang YANGMODELS=/usr/local/share/yangmodels # Standard IETF RFC yang files. diff --git a/test/lib.sh b/test/lib.sh index 02728155..32b11f96 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -78,10 +78,10 @@ testname= # Parse yangmodels from https://github.com/YangModels/yang # Recommended: checkout yangmodels elsewhere in the tree and set the env # to that -: ${YANGMODELS=$(pwd)/yang} +#: ${YANGMODELS=$(pwd)/yang} # just skip if not set # Parse yang openconfig models from https://github.com/openconfig/public -: ${OPENCONFIG=$(pwd)/public} +#: ${OPENCONFIG=$(pwd)/public} # just skip if not set # Standard IETF RFC yang files. : ${IETFRFC=../yang/standard} diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh index 387b25c9..c3b491a7 100755 --- a/test/test_openconfig.sh +++ b/test/test_openconfig.sh @@ -18,7 +18,7 @@ fyang=$dir/test.yang new "openconfig" if [ ! -d "$OPENCONFIG" ]; then # err "Hmm Openconfig dir does not seem to exist, try git clone https://github.com/openconfig/public?" - exit + if [ "$s" = $0 ]; then exit 0; else return 0; fi fi OCDIR=$OPENCONFIG/release/models diff --git a/test/test_yangmodels.sh b/test/test_yangmodels.sh index 9acfc191..91bfcc0e 100755 --- a/test/test_yangmodels.sh +++ b/test/test_yangmodels.sh @@ -27,7 +27,7 @@ fyang=$dir/test.yang if [ ! -d "$YANGMODELS" ]; then # err "Hmm Yangmodels dir does not seem to exist, try git clone https://github.com/YangModels/yang?" - exit + if [ "$s" = $0 ]; then exit 0; else return 0; fi fi # Experimental IEEE diff --git a/util/README.md b/util/README.md index 542cb620..917edc41 100644 --- a/util/README.md +++ b/util/README.md @@ -2,4 +2,6 @@ This directory contains Clixon utility programs, ie, programs that are good to have for testing, analysis, etc, but not an actual part of -delivered code. \ No newline at end of file +delivered code. + +Note, streams utility may need: libcurl4-openssl-dev or corresponding.