diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c index ee2d7822..4c5e4e22 100644 --- a/apps/restconf/restconf_main_native.c +++ b/apps/restconf/restconf_main_native.c @@ -236,7 +236,7 @@ buf_write(char *buf, ssize_t totlen = 0; int er; - clicon_debug(1, "%s %lu", __FUNCTION__, buflen); + clicon_debug(1, "%s", __FUNCTION__); while (totlen < buflen){ if (ssl){ if ((len = SSL_write(ssl, buf+totlen, buflen-totlen)) <= 0){ diff --git a/test/test_openconfig_interfaces.sh b/test/test_openconfig_interfaces.sh index 94a16a34..a880f6ca 100755 --- a/test/test_openconfig_interfaces.sh +++ b/test/test_openconfig_interfaces.sh @@ -1,13 +1,5 @@ #!/usr/bin/env bash -# Parse "all" openconfig yangs from https://github.com/openconfig/public -# Notes: -# Notes: -# - A simple smoketest (CLI check) is made, essentially YANG parsing. -# - A full system is worked on -# - Env-var OPENCONFIG should point to checkout place. (define it in site.sh for example) -# - Env variable YANGMODELS should point to checkout place. (define it in site.sh for example) -# - Some DIFFs are necessary in yangmodels -# release/models/wifi/openconfig-ap-interfaces.yang +# Run a system around openconfig interface, ie: openconfig-if-ethernet # Magic line must be first in script (see README.md) s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi @@ -93,8 +85,8 @@ module clixon-example{ import ietf-interfaces { prefix ietf-if; } - import openconfig-interfaces { - prefix oc-if; + import openconfig-if-ethernet { + prefix oc-eth; } identity eth { /* Need to create an interface-type identity for leafrefs */ base ietf-if:interface-type; @@ -144,7 +136,13 @@ new "$clixon_cli -D $DBG -1f $cfg -y $f show version" expectpart "$($clixon_cli -D $DBG -1f $cfg show version)" 0 "${CLIXON_VERSION}" new "$clixon_netconf -qf $cfg" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eeex:ethfalsetrue00]]>]]>" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eeex:ethfalsetrue00truefalse]]>]]>" + +new "cli show configuration" +expectpart "$($clixon_cli -1 -f $cfg show conf xml)" 0 "^" "" + +new "cli set interfaces interface complete: e" +expectpart "$(echo "set interfaces interface " | $clixon_cli -f $cfg)" 0 "interface e" if [ $BE -ne 0 ]; then new "Kill backend" diff --git a/test/test_restconf.sh b/test/test_restconf.sh index c6b355dc..481dd559 100755 --- a/test/test_restconf.sh +++ b/test/test_restconf.sh @@ -169,7 +169,7 @@ function testrun() # Negative test GET datastore if [ $proto = http ]; then # see (2) https to http port in restconf_main_openssl.c new "Wrong proto=https on http port, expect err 35 wrong version number" - expectpart "$(curl $CURLOPTS -X GET https://$addr:80/.well-known/host-meta 2>&1)" 35 "wrong version number" + expectpart "$(curl $CURLOPTS -X GET https://$addr:80/.well-known/host-meta 2>&1)" 35 #"wrong version number" # dependent on curl version else # see (1) http to https port in restconf_main_openssl.c new "Wrong proto=http on https port, expect bad request" expectpart "$(curl $CURLOPTS -X GET http://$addr:443/.well-known/host-meta)" 0 "HTTP/1.1 400 Bad Request"