From dec05e2cae28422d3d44786c104dc758c46e46d1 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Mon, 3 Jan 2022 09:21:19 +0100 Subject: [PATCH] Test modifications - Remove dependency of IETF YANGs on most tests - Remove dependnency of example/main in most tests, instead make local copy of example yang --- CHANGELOG.md | 5 +- test/test_api.sh | 1 - test/test_c++.sh | 40 ++++++++- test/test_choice.sh | 1 - test/test_cli_auto.sh | 1 - test/test_cli_history.sh | 13 ++- test/test_cli_submodes.sh | 18 ++-- test/test_cli_translate.sh | 25 +++++- test/test_cli_varonly.sh | 1 - test/test_client.sh | 1 - test/test_copy_config.sh | 58 +++++++++--- test/test_debug.sh | 1 - test/test_identity.sh | 1 - test/test_leaf_default.sh | 1 - test/test_leafref_union.sh | 1 - test/test_minmax.sh | 1 - test/test_nacm.sh | 4 - test/test_nacm_credentials.sh | 4 - test/test_nacm_datanode.sh | 1 - test/test_nacm_datanode_paths.sh | 1 - test/test_nacm_datanode_read.sh | 1 - test/test_nacm_datanode_write.sh | 1 - test/test_nacm_default.sh | 4 - test/test_nacm_ext.sh | 49 ++++++++++- test/test_nacm_module_read.sh | 61 ++++++++++++- test/test_nacm_module_write.sh | 31 ++++++- test/test_nacm_protocol.sh | 4 - test/test_nacm_recovery.sh | 4 - test/test_netconf_hello.sh | 14 ++- test/test_netconf_notifications.sh | 1 - test/test_netconf_ssh_callhome.sh | 14 ++- test/test_openconfig.sh | 1 - test/test_openconfig_system.sh | 1 - test/test_order.sh | 20 ++++- test/test_pagination_config.sh | 1 - test/test_privileges.sh | 16 +++- test/test_restconf_basic_auth.sh | 2 - test/test_restconf_http_upgrade.sh | 1 - test/test_restconf_internal.sh | 1 - test/test_restconf_internal_usecases.sh | 1 - test/test_restconf_jukebox.sh | 1 - test/test_restconf_listkey.sh | 1 - test/test_restconf_netns.sh | 28 ++++-- test/test_restconf_nmap.sh | 18 ++-- test/test_restconf_notifications.sh | 1 - test/test_restconf_op.sh | 1 - test/test_restconf_plain_patch.sh | 1 - test/test_restconf_ssl_certs.sh | 1 - test/test_restconf_yang_patch_json.sh | 1 - test/test_restconf_yang_patch_xml.sh | 1 - test/test_rpc.sh | 112 +++++++++++++++++++++++- test/test_sock.sh | 13 ++- test/test_startup.sh | 58 +++++++++--- test/test_type.sh | 1 - test/test_type_range.sh | 1 - test/test_union.sh | 1 - test/test_when_must.sh | 1 - test/test_with_default.sh | 1 - test/test_xpath_functions.sh | 1 - test/test_yang.sh | 1 - test/test_yang_anydata.sh | 1 - test/test_yang_bind.sh | 1 - test/test_yang_default.sh | 1 - test/test_yang_deviation.sh | 1 - test/test_yang_extension.sh | 1 - test/test_yang_load.sh | 8 -- test/test_yang_namespace.sh | 1 - 67 files changed, 516 insertions(+), 149 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d0fb14a..8c0e67d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,7 +72,10 @@ Users may have to change how they access the system ### Minor features -* Tests: use `YANG_STANDARD_DIR` from `./configure --with-yang-standard-dir=DIR` instead of `YANGMODELS` from site.sh +* Test changes + * Use `YANG_STANDARD_DIR` from `./configure --with-yang-standard-dir=DIR` instead of `YANGMODELS` from site.sh + * Remove dependency of IETF YANGs on most tests + * Remove dependnency of example/main in most tests, instead make local copy of example yang * New `clixon-dev` development container (Work-in-progress) * New `clixon-clispec.yang` for controlling auto-cli (Work-in-progress) * Changed typo `configure --with-yang-standard-installdir` to `configure --with-yang-standard-dir` diff --git a/test/test_api.sh b/test/test_api.sh index 9fc7a665..9bd894cf 100755 --- a/test/test_api.sh +++ b/test/test_api.sh @@ -32,7 +32,6 @@ cat < $cfg /tmp/conf_yang.xml clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_c++.sh b/test/test_c++.sh index ad4725ac..5d67b774 100755 --- a/test/test_c++.sh +++ b/test/test_c++.sh @@ -10,6 +10,7 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi cfile=$dir/c++.cpp APPNAME=example +fyang=$dir/clixon-example.yang cfg=$dir/conf.xml test -d $dir/backend || mkdir $dir/backend @@ -18,8 +19,7 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang $dir/backend /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli @@ -30,6 +30,42 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + rpc example { + description "Some example input/output for testing RFC7950 7.14. + RPC simply echoes the input for debugging."; + input { + leaf x { + description + "If a leaf in the input tree has a 'mandatory' statement with + the value 'true', the leaf MUST be present in an RPC invocation."; + type string; + mandatory true; + } + leaf y { + description + "If a leaf in the input tree has a 'mandatory' statement with the + value 'true', the leaf MUST be present in an RPC invocation."; + type string; + default "42"; + } + } + output { + leaf x { + type string; + } + leaf y { + type string; + } + } + } +} +EOF + cat< $cfile #include #include diff --git a/test/test_choice.sh b/test/test_choice.sh index 719350a8..71aa3a61 100755 --- a/test/test_choice.sh +++ b/test/test_choice.sh @@ -23,7 +23,6 @@ cat < $cfg clixon-restconf:allow-auth-none $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_cli_auto.sh b/test/test_cli_auto.sh index 5670c6fa..1fb70cf4 100755 --- a/test/test_cli_auto.sh +++ b/test/test_cli_auto.sh @@ -20,7 +20,6 @@ cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/backend $APPNAME diff --git a/test/test_cli_history.sh b/test/test_cli_history.sh index d4a756f5..4382486c 100755 --- a/test/test_cli_history.sh +++ b/test/test_cli_history.sh @@ -12,14 +12,13 @@ cfg=$dir/conf_yang.xml histfile=$dir/histfile histsize=10 -# Use yang in example +fyang=$dir/clixon-example.yang cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/backend /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli @@ -32,6 +31,14 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + cat < $histfile first line EOF diff --git a/test/test_cli_submodes.sh b/test/test_cli_submodes.sh index 23dbf0fa..e38cf33e 100755 --- a/test/test_cli_submodes.sh +++ b/test/test_cli_submodes.sh @@ -15,20 +15,18 @@ APPNAME=example # include err() and new() functions and creates $dir cfg=$dir/conf_yang.xml +fyang=$dir/clixon-example.yang clidir=$dir/clidir if [ ! -d $clidir ]; then mkdir $clidir fi -# Use yang in example - cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/backend $clidir /usr/local/lib/$APPNAME/cli @@ -38,6 +36,14 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + # clispec files 1..6 for submodes AAA and BBB as described in top comment cat < $clidir/cli1.cli @@ -92,7 +98,7 @@ for c in 1 2 5; do done # Tests using mode AAA that should fail for c in 3 4 6; do - new "cli mode $m 1 cmd$c Not OK" + new "cli mode $m 1 cmd$c Expect fail" expectpart "$($clixon_cli -1 -m $m -f $cfg cmd$c)" 255 "^$" done @@ -104,7 +110,7 @@ for c in 1 3 5 6; do done # Tests using mode BBB that should fail for c in 2 4; do - new "cli mode $m 1 cmd$c Not OK" + new "cli mode $m 1 cmd$c Expect fail" expectpart "$($clixon_cli -1 -m $m -f $cfg cmd$c)" 255 "^$" done diff --git a/test/test_cli_translate.sh b/test/test_cli_translate.sh index 0861ecbb..1c2896ce 100755 --- a/test/test_cli_translate.sh +++ b/test/test_cli_translate.sh @@ -13,14 +13,13 @@ APPNAME=example cfg=$dir/conf_yang.xml -# Use yang in example +fyang=$dir/clixon-example.yang cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang $dir /usr/local/lib/$APPNAME/cli $APPNAME @@ -31,6 +30,26 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + /* Generic config data */ + container table{ + list parameter{ + key name; + leaf name{ + type string; + } + leaf value{ + type string; + } + } + } +} +EOF + # The diff here is the "translate" command that adds entry table/parameter=translate cat< $dir/example_cli.cli # Clixon example specification diff --git a/test/test_cli_varonly.sh b/test/test_cli_varonly.sh index bca7bc48..4542b302 100755 --- a/test/test_cli_varonly.sh +++ b/test/test_cli_varonly.sh @@ -18,7 +18,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir example /usr/local/lib/$APPNAME/backend diff --git a/test/test_client.sh b/test/test_client.sh index 279b95fc..1c105824 100755 --- a/test/test_client.sh +++ b/test/test_client.sh @@ -30,7 +30,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_copy_config.sh b/test/test_copy_config.sh index 0f3e5135..565de80d 100755 --- a/test/test_copy_config.sh +++ b/test/test_copy_config.sh @@ -27,7 +27,7 @@ APPNAME=example cfg=$dir/conf_yang.xml -# Use yang in example +fyang=$dir/ietf-interfaces@2019-03-04.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none true) @@ -39,8 +39,7 @@ cat < $cfg clixon-restconf:allow-auth-none 42 /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ @@ -55,6 +54,43 @@ cat < $cfg EOF +# Stub ietf-interfaces for test +cat < $fyang +module ietf-interfaces { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces"; + prefix if; + revision "2019-03-04"; + identity interface-type { + description + "Base identity from which specific interface types are + derived."; + } + identity fddi { + base interface-type; + } + container interfaces { + description "Interface parameters."; + list interface { + key "name"; + leaf name { + type string; + } + leaf type { + type identityref { + base interface-type; + } + mandatory true; + } + leaf enabled { + type boolean; + default "true"; + } + } + } +} +EOF + # Create empty startup cat < $dir/startup_db <${DATASTORE_TOP}/> @@ -93,13 +129,13 @@ new "wait restconf" wait_restconf new "Add config to candidate" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0ex:ethnone ]]>]]>" "^]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0if:fddinone ]]>]]>" "^]]>]]>$" new "netconf commit to running" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" new "Delete candidate" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0ex:ethnone ]]>]]>" "^]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0if:fddinone ]]>]]>" "^]]>]]>$" # Here startup and candidate are empty, only running has content # test running->startup and running->candidate @@ -117,10 +153,10 @@ expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0ex:ethtrue]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0if:fdditrue]]>]]>$" new "Check startup content" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0ex:ethtrue]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0if:fdditrue]]>]]>$" new "Delete startup" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" @@ -134,10 +170,10 @@ new "copy candidate->startup" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" new "Check startup content" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0ex:ethtrue]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0if:fdditrue]]>]]>$" new "Delete candidate" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0ex:ethnone ]]>]]>" "^]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0if:fddinone ]]>]]>" "^]]>]]>$" # Here candidate is empty and startup has content # test startup->candidate @@ -148,11 +184,11 @@ new "copy startup->candidate" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" new "Check candidate content" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0ex:ethtrue]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^eth/0/0if:fdditrue]]>]]>$" # Negative test: check copying to running is not allowed new "Delete candidate" -expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0ex:ethnone ]]>]]>" "^]]>]]>$" +expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLOeth/0/0if:fddinone ]]>]]>" "^]]>]]>$" new "netconf commit to running" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" diff --git a/test/test_debug.sh b/test/test_debug.sh index e2391e94..e67f23cc 100755 --- a/test/test_debug.sh +++ b/test/test_debug.sh @@ -18,7 +18,6 @@ cat < $cfg clixon-restconf:allow-auth-none $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/var/$APPNAME/$APPNAME.sock $dir/restconf.pidfile diff --git a/test/test_identity.sh b/test/test_identity.sh index 3e900669..746c3502 100755 --- a/test/test_identity.sh +++ b/test/test_identity.sh @@ -20,7 +20,6 @@ cat < $cfg clixon-restconf:allow-auth-none $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_leaf_default.sh b/test/test_leaf_default.sh index d36553c0..3b818b04 100755 --- a/test/test_leaf_default.sh +++ b/test/test_leaf_default.sh @@ -29,7 +29,6 @@ cat < $cfg ietf-netconf:startup $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_leafref_union.sh b/test/test_leafref_union.sh index 94371afc..d34f79f2 100755 --- a/test/test_leafref_union.sh +++ b/test/test_leafref_union.sh @@ -15,7 +15,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_minmax.sh b/test/test_minmax.sh index 87017918..ef1a692a 100755 --- a/test/test_minmax.sh +++ b/test/test_minmax.sh @@ -13,7 +13,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_nacm.sh b/test/test_nacm.sh index 6ea74780..d83f7870 100755 --- a/test/test_nacm.sh +++ b/test/test_nacm.sh @@ -24,7 +24,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf @@ -45,9 +44,6 @@ module nacm-example{ yang-version 1.1; namespace "urn:example:nacm"; prefix nex; - import clixon-example { - prefix ex; - } import ietf-netconf-acm { prefix nacm; } diff --git a/test/test_nacm_credentials.sh b/test/test_nacm_credentials.sh index aaff9a18..5eff478e 100755 --- a/test/test_nacm_credentials.sh +++ b/test/test_nacm_credentials.sh @@ -26,9 +26,6 @@ module nacm-example{ yang-version 1.1; namespace "urn:example:nacm"; prefix nex; - import clixon-example { - prefix ex; - } import ietf-netconf-acm { prefix nacm; } @@ -115,7 +112,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang $family $sock diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh index b872b9b9..d3924d31 100755 --- a/test/test_nacm_datanode.sh +++ b/test/test_nacm_datanode.sh @@ -52,7 +52,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir $fyang /usr/local/lib/$APPNAME/clispec diff --git a/test/test_nacm_datanode_paths.sh b/test/test_nacm_datanode_paths.sh index cb163e9c..589d1183 100755 --- a/test/test_nacm_datanode_paths.sh +++ b/test/test_nacm_datanode_paths.sh @@ -24,7 +24,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir $fyang ietf-netconf:startup diff --git a/test/test_nacm_datanode_read.sh b/test/test_nacm_datanode_read.sh index 6e047b97..ae471833 100755 --- a/test/test_nacm_datanode_read.sh +++ b/test/test_nacm_datanode_read.sh @@ -32,7 +32,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir $fyang /usr/local/lib/$APPNAME/clispec diff --git a/test/test_nacm_datanode_write.sh b/test/test_nacm_datanode_write.sh index 55fe39c6..e6f251de 100755 --- a/test/test_nacm_datanode_write.sh +++ b/test/test_nacm_datanode_write.sh @@ -24,7 +24,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir $fyang /usr/local/lib/$APPNAME/clispec diff --git a/test/test_nacm_default.sh b/test/test_nacm_default.sh index 3609604b..906ed3c7 100755 --- a/test/test_nacm_default.sh +++ b/test/test_nacm_default.sh @@ -21,7 +21,6 @@ cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf @@ -44,9 +43,6 @@ module nacm-example{ yang-version 1.1; namespace "urn:example:nacm"; prefix nex; - import clixon-example { - prefix ex; - } import ietf-netconf-acm { prefix nacm; } diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh index 99767820..1e8fe07a 100755 --- a/test/test_nacm_ext.sh +++ b/test/test_nacm_ext.sh @@ -13,6 +13,7 @@ APPNAME=example cfg=$dir/conf_yang.xml fyang=$dir/nacm-example.yang +fyang2=$dir/clixon-example.yang nacmfile=$dir/nacmfile # Define default restconfig config: RESTCONFIG @@ -23,8 +24,7 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - $fyang + $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ @@ -79,6 +79,51 @@ module nacm-example{ } EOF +cat < $fyang2 +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + /* State data (not config) for the example application*/ + container state { + config false; + description "state data for the example application (must be here for example get operation)"; + leaf-list op { + type string; + } + } + rpc example { + description "Some example input/output for testing RFC7950 7.14. + RPC simply echoes the input for debugging."; + input { + leaf x { + description + "If a leaf in the input tree has a 'mandatory' statement with + the value 'true', the leaf MUST be present in an RPC invocation."; + type string; + mandatory true; + } + leaf y { + description + "If a leaf in the input tree has a 'mandatory' statement with the + value 'true', the leaf MUST be present in an RPC invocation."; + type string; + default "42"; + } + } + output { + leaf x { + type string; + } + leaf y { + type string; + } + } + } +} +EOF + + cat < $nacmfile true diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh index 80f2bb1c..c0ac72c8 100755 --- a/test/test_nacm_module_read.sh +++ b/test/test_nacm_module_read.sh @@ -17,6 +17,7 @@ APPNAME=example cfg=$dir/conf_yang.xml fyang=$dir/nacm-example.yang +fyang2=$dir/clixon-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) @@ -25,8 +26,7 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - $fyang + $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli @@ -60,6 +60,61 @@ module nacm-example{ } EOF +cat < $fyang2 +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + container table{ + list parameter{ + key name; + leaf name{ + type string; + } + leaf value{ + type string; + } + } + } + /* State data (not config) for the example application*/ + container state { + config false; + description "state data for the example application (must be here for example get operation)"; + leaf-list op { + type string; + } + } + rpc example { + description "Some example input/output for testing RFC7950 7.14. + RPC simply echoes the input for debugging."; + input { + leaf x { + description + "If a leaf in the input tree has a 'mandatory' statement with + the value 'true', the leaf MUST be present in an RPC invocation."; + type string; + mandatory true; + } + leaf y { + description + "If a leaf in the input tree has a 'mandatory' statement with the + value 'true', the leaf MUST be present in an RPC invocation."; + type string; + default "42"; + } + } + output { + leaf x { + type string; + } + leaf y { + type string; + } + } + } +} +EOF + # The groups are slightly modified from RFC8341 A.1 ($USER added in admin group) # The rule-list is from A.2 RULES=$(cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - $fyang + $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli @@ -84,6 +84,33 @@ module nacm-example{ } EOF +cat < $fyang2 +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + container table{ + list parameter{ + key name; + leaf name{ + type string; + } + leaf value{ + type string; + } + } + } + /* State data (not config) for the example application*/ + container state { + config false; + description "state data for the example application (must be here for example get operation)"; + leaf-list op { + type string; + } + } +} +EOF + # The groups are slightly modified from RFC8341 A.1 ($USER added in admin group) # The rule-list is from A.2 RULES=$(cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf @@ -64,9 +63,6 @@ module nacm-example{ yang-version 1.1; namespace "urn:example:nacm"; prefix nex; - import clixon-example { - prefix ex; - } import ietf-netconf-acm { prefix nacm; } diff --git a/test/test_nacm_recovery.sh b/test/test_nacm_recovery.sh index 58aa7a4b..18957605 100755 --- a/test/test_nacm_recovery.sh +++ b/test/test_nacm_recovery.sh @@ -28,9 +28,6 @@ module nacm-example{ yang-version 1.1; namespace "urn:example:nacm"; prefix nex; - import clixon-example { - prefix ex; - } import ietf-netconf-acm { prefix nacm; } @@ -73,7 +70,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/restconf diff --git a/test/test_netconf_hello.sh b/test/test_netconf_hello.sh index 8fdcb958..57d97796 100755 --- a/test/test_netconf_hello.sh +++ b/test/test_netconf_hello.sh @@ -12,18 +12,16 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi APPNAME=example cfg=$dir/conf_yang.xml +fyang=$dir/clixon-example.yang tmp=$dir/tmp.x -# Use yang in example - cat < $cfg $cfg ietf-netconf:startup 42 /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ @@ -38,6 +36,14 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + new "test params: -f $cfg -- -s" # Bring your own backend if [ $BE -ne 0 ]; then diff --git a/test/test_netconf_notifications.sh b/test/test_netconf_notifications.sh index 6ed34773..6fb3356f 100755 --- a/test/test_netconf_notifications.sh +++ b/test/test_netconf_notifications.sh @@ -30,7 +30,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/lib/$APPNAME/backend diff --git a/test/test_netconf_ssh_callhome.sh b/test/test_netconf_ssh_callhome.sh index a243b54d..078ddf01 100755 --- a/test/test_netconf_ssh_callhome.sh +++ b/test/test_netconf_ssh_callhome.sh @@ -21,6 +21,7 @@ fi APPNAME=example cfg=$dir/conf_yang.xml +fyang=$dir/clixon-example.yang sshcfg=$dir/ssh.conf sshdcfg=$dir/sshd.conf rpccmd=$dir/rpccmd.xml @@ -31,15 +32,12 @@ key=$keydir/mykey # XXX cant get it to work with this file under tmp dir so have to place it in homedir authfile=$HOME/.ssh/clixon_authorized_keys_removeme -# Use yang in example - cat < $cfg $cfg 42 /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ @@ -50,6 +48,14 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + cat < $rpccmd $DEFAULTHELLO diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh index 53750524..b403ba7e 100755 --- a/test/test_openconfig.sh +++ b/test/test_openconfig.sh @@ -29,7 +29,6 @@ cat < $cfg ietf-netconf:startup /usr/local/share/clixon $OPENCONFIG - $IETFRFC true /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_openconfig_system.sh b/test/test_openconfig_system.sh index 9269f5ae..565b4686 100755 --- a/test/test_openconfig_system.sh +++ b/test/test_openconfig_system.sh @@ -27,7 +27,6 @@ cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $OCDIR $fyang /usr/local/lib/$APPNAME/clispec diff --git a/test/test_order.sh b/test/test_order.sh index d937a8da..421e5678 100755 --- a/test/test_order.sh +++ b/test/test_order.sh @@ -17,6 +17,7 @@ APPNAME=example cfg=$dir/conf_yang.xml fyang=$dir/order.yang +fyang2=$dir/clixon-example.yang tmp=$dir/tmp.x # For memcheck @@ -33,8 +34,7 @@ cat < $cfg /tmp/conf_yang.xml /usr/local/share/clixon - $IETFRFC - $fyang + $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME @@ -155,6 +155,22 @@ module order-example{ } EOF +cat < $fyang2 +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + /* State data (not config) for the example application*/ + container state { + config false; + description "state data for the example application (must be here for example get operation)"; + leaf-list op { + type string; + } + } +} +EOF + rm -f $dbdir/candidate_db # alt cat < $dbdir/running_db diff --git a/test/test_pagination_config.sh b/test/test_pagination_config.sh index c20916ce..52d75580 100755 --- a/test/test_pagination_config.sh +++ b/test/test_pagination_config.sh @@ -30,7 +30,6 @@ cat < $cfg ietf-netconf:startup clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/lib/$APPNAME/backend diff --git a/test/test_privileges.sh b/test/test_privileges.sh index fbc9718e..bab5988b 100755 --- a/test/test_privileges.sh +++ b/test/test_privileges.sh @@ -10,28 +10,36 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi APPNAME=example -cfg=$dir/conf_startup.xml - # Dont run this test with valgrind if [ $valgrindtest -ne 0 ]; then echo "...skipped " return 0 # skip fi +cfg=$dir/conf_startup.xml +fyang=$dir/clixon-example.yang + # Here $dir is created by the user that runs the script cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang $dir/$APPNAME.sock /var/tmp/$APPNAME.pidfile $dir EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + # Create a pre-set running, startup and (extra) config. # The configs are identified by an interface called run, startup, extra. # Depending on startup mode (init, none, running, or startup) diff --git a/test/test_restconf_basic_auth.sh b/test/test_restconf_basic_auth.sh index 6f4db328..901edca6 100755 --- a/test/test_restconf_basic_auth.sh +++ b/test/test_restconf_basic_auth.sh @@ -43,7 +43,6 @@ cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend @@ -188,7 +187,6 @@ function testrun() ietf-netconf:startup clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_http_upgrade.sh b/test/test_restconf_http_upgrade.sh index 2dd06871..a860bc00 100755 --- a/test/test_restconf_http_upgrade.sh +++ b/test/test_restconf_http_upgrade.sh @@ -34,7 +34,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_internal.sh b/test/test_restconf_internal.sh index e7004d75..263be37f 100755 --- a/test/test_restconf_internal.sh +++ b/test/test_restconf_internal.sh @@ -53,7 +53,6 @@ cat < $cfg clixon-restconf:allow-auth-none $EXTRACONF /usr/local/share/clixon - $IETFRFC $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh index 9631f5e1..c5bbcb21 100755 --- a/test/test_restconf_internal_usecases.sh +++ b/test/test_restconf_internal_usecases.sh @@ -67,7 +67,6 @@ cat < $cfg clixon-restconf:allow-auth-none $EXTRACONF /usr/local/share/clixon - $IETFRFC $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_jukebox.sh b/test/test_restconf_jukebox.sh index 29648dad..57d48346 100755 --- a/test/test_restconf_jukebox.sh +++ b/test/test_restconf_jukebox.sh @@ -32,7 +32,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_listkey.sh b/test/test_restconf_listkey.sh index 30a674c1..4cf6ee84 100755 --- a/test/test_restconf_listkey.sh +++ b/test/test_restconf_listkey.sh @@ -20,7 +20,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $fyang /usr/local/var/$APPNAME/$APPNAME.sock $dir/restconf.pidfile diff --git a/test/test_restconf_netns.sh b/test/test_restconf_netns.sh index dcb5899a..911c06f6 100755 --- a/test/test_restconf_netns.sh +++ b/test/test_restconf_netns.sh @@ -37,7 +37,7 @@ APPNAME=example cfg=$dir/conf.xml startupdb=$dir/startup_db - +fyang=$dir/clixon-example.yang netns=clixonnetns veth=veth0 vethpeer=veth1 @@ -98,8 +98,7 @@ cat < $cfg ietf-netconf:startup clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ @@ -114,6 +113,26 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + /* Generic config data */ + container table{ + list parameter{ + key name; + leaf name{ + type string; + } + leaf value{ + type string; + } + } + } +} +EOF + new "Create netns: $netns" sudo ip netns delete $netns # Create netns @@ -254,8 +273,7 @@ cat < $cfg ietf-netconf:startup clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend example_backend.so$ diff --git a/test/test_restconf_nmap.sh b/test/test_restconf_nmap.sh index bdea1c59..7d456ab0 100755 --- a/test/test_restconf_nmap.sh +++ b/test/test_restconf_nmap.sh @@ -26,22 +26,17 @@ RCPROTO=https APPNAME=example cfg=$dir/conf.xml +fyang=$dir/clixon-example.yang # If nmap not installed just quietly quit if [ ! -n "$(type nmap 2> /dev/null)" ]; then if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip fi -# clixon-example and clixon-restconf is used in the test, need local copy +# clixon-restconf is used in the test, need local copy # This is a kludge: look in src otherwise assume it is installed in /usr/local/share # Note that revisions may change and may need to be updated -y="clixon-example@${CLIXON_EXAMPLE_REV}.yang" -if [ -d ${TOP_SRCDIR}/example/main/$y ]; then - cp ${TOP_SRCDIR}/example/main/$y $dir/ -else - cp /usr/local/share/clixon/$y $dir/ -fi y=clixon-restconf@${CLIXON_RESTCONF_REV}.yang if [ -d ${TOP_SRCDIR}/yang/clixon ]; then cp ${TOP_SRCDIR}/yang/clixon/$y $dir/ @@ -49,6 +44,14 @@ else cp /usr/local/share/clixon/$y $dir/ fi +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF + if [ "${WITH_RESTCONF}" = "native" ]; then # Create server certs certdir=$dir/certs @@ -83,7 +86,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_notifications.sh b/test/test_restconf_notifications.sh index 75ce9d6a..9a136285 100755 --- a/test/test_restconf_notifications.sh +++ b/test/test_restconf_notifications.sh @@ -51,7 +51,6 @@ cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC $fyang /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_op.sh b/test/test_restconf_op.sh index 8567b166..68887bbd 100755 --- a/test/test_restconf_op.sh +++ b/test/test_restconf_op.sh @@ -21,7 +21,6 @@ cat < $cfg clixon-restconf:allow-auth-none $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/var/$APPNAME/$APPNAME.sock $dir/restconf.pidfile diff --git a/test/test_restconf_plain_patch.sh b/test/test_restconf_plain_patch.sh index 6811b282..b13cdf36 100755 --- a/test/test_restconf_plain_patch.sh +++ b/test/test_restconf_plain_patch.sh @@ -19,7 +19,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock ietf-netconf:startup diff --git a/test/test_restconf_ssl_certs.sh b/test/test_restconf_ssl_certs.sh index 799f3ff5..9deb75ed 100755 --- a/test/test_restconf_ssl_certs.sh +++ b/test/test_restconf_ssl_certs.sh @@ -192,7 +192,6 @@ cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_restconf_yang_patch_json.sh b/test/test_restconf_yang_patch_json.sh index 8feddd95..220e7386 100755 --- a/test/test_restconf_yang_patch_json.sh +++ b/test/test_restconf_yang_patch_json.sh @@ -24,7 +24,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock ietf-netconf:startup diff --git a/test/test_restconf_yang_patch_xml.sh b/test/test_restconf_yang_patch_xml.sh index 32a233fc..a20f5d1b 100755 --- a/test/test_restconf_yang_patch_xml.sh +++ b/test/test_restconf_yang_patch_xml.sh @@ -25,7 +25,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock ietf-netconf:startup diff --git a/test/test_rpc.sh b/test/test_rpc.sh index 9b8acd9c..aa31317b 100755 --- a/test/test_rpc.sh +++ b/test/test_rpc.sh @@ -2,7 +2,7 @@ # RPC tests # Validate parameters in restconf and netconf, check namespaces, etc # See rfc8040 3.6 -# Use the example application that has one mandatory input arg, +# Use snippet of example application that has one mandatory input arg, # At the end is an alternative Yang without mandatory arg for # valid empty input and output. @@ -13,17 +13,17 @@ APPNAME=example cfg=$dir/conf.xml +fyang=$dir/clixon-example.yang + # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) -# Use yang in example cat < $cfg $cfg clixon-restconf:allow-auth-none /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang /usr/local/lib/$APPNAME/backend /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli @@ -35,6 +35,110 @@ cat < $cfg EOF +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; + + rpc empty { + description "Smallest possible RPC with no input or output sections"; + } + rpc optional { + description "Small RPC with optional input and output"; + input { + leaf x { + type string; + } + } + output { + leaf x { + type string; + } + } + } + rpc example { + description "Some example input/output for testing RFC7950 7.14. + RPC simply echoes the input for debugging."; + input { + leaf x { + description + "If a leaf in the input tree has a 'mandatory' statement with + the value 'true', the leaf MUST be present in an RPC invocation."; + type string; + mandatory true; + } + leaf y { + description + "If a leaf in the input tree has a 'mandatory' statement with the + value 'true', the leaf MUST be present in an RPC invocation."; + type string; + default "42"; + } + leaf-list z { + description + "If a leaf-list in the input tree has one or more default + values, the server MUST use these values (XXX not supported)"; + type string; + } + + leaf w { + description + "If any node has a 'when' statement that would evaluate to + 'false',then this node MUST NOT be present in the input tree. + (XXX not supported)"; + type string; + } + list u0 { + description "list without key"; + leaf uk{ + type string; + } + } + list u1 { + description "list with key"; + key uk; + leaf uk{ + type string; + } + leaf val{ + type string; + } + } + } + output { + leaf x { + type string; + } + leaf y { + type string; + } + leaf z { + type string; + } + leaf w { + type string; + } + + list u0 { + leaf uk{ + type string; + } + } + list u1 { + key uk; + leaf uk{ + type string; + } + leaf val{ + type string; + } + } + } + } +} +EOF + new "test params: -f $cfg" if [ $BE -ne 0 ]; then new "kill old backend" diff --git a/test/test_sock.sh b/test/test_sock.sh index 6b924cfb..f66eb3d0 100755 --- a/test/test_sock.sh +++ b/test/test_sock.sh @@ -15,7 +15,15 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi APPNAME=example cfg=$dir/conf.xml -fyang=$dir/socket.yang +fyang=$dir/clixon-example.yang + +cat < $fyang +module clixon-example{ + yang-version 1.1; + namespace "urn:example:clixon"; + prefix ex; +} +EOF # Set socket family and start backend and run a single cli command to # check socket works @@ -32,8 +40,7 @@ cat < $cfg $cfg *:* /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang $family 4535 $sock diff --git a/test/test_startup.sh b/test/test_startup.sh index bb188711..b8a17409 100755 --- a/test/test_startup.sh +++ b/test/test_startup.sh @@ -20,13 +20,14 @@ APPNAME=example cfg=$dir/conf_startup.xml +fyang=$dir/ietf-interfaces@2019-03-04.yang + cat < $cfg $cfg ietf-netconf:startup /usr/local/share/clixon - $IETFRFC - clixon-example + $fyang $APPNAME /usr/local/lib/$APPNAME/backend /usr/local/lib/$APPNAME/netconf @@ -42,23 +43,60 @@ cat < $cfg EOF +# Stub ietf-interfaces for test +cat < $fyang +module ietf-interfaces { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces"; + prefix if; + revision "2019-03-04"; + identity interface-type { + description + "Base identity from which specific interface types are + derived."; + } + identity fddi { + base interface-type; + } + container interfaces { + description "Interface parameters."; + list interface { + key "name"; + leaf name { + type string; + } + leaf type { + type identityref { + base interface-type; + } + mandatory true; + } + leaf enabled { + type boolean; + default "true"; + } + } + } +} +EOF + # Create running-db containin the interface "run" OK -runvar='runex:ethtrue' +runvar='runif:fdditrue' # Create startup-db containing the interface "startup" OK -startvar='startupex:ethtrue' +startvar='startupif:fdditrue' # extra OK -extravar='extraex:ethtrue' +extravar='extraif:fdditrue' # invalid (contains ), but OK XML syntax -invalidvar='invalidex:ethtrue' +invalidvar='invalidif:fdditrue' # Broken XML (contains ) -brokenvar='brokenex:ethtrue' +brokenvar='brokenif:fdditrue' # Startup XML with state -statevar='startupupex:ethtrue' +statevar='startupupif:fdditrue' # Create a pre-set running, startup and (extra) config. # The configs are identified by an interface called run, startup, extra. @@ -166,10 +204,10 @@ testrun init "$runvar" "$startvar" "$extravar" "$extravar" testrun none "$runvar" "$startvar" "$extravar" "$runvar" # Running mode: keep running but load also extra -testrun running "$runvar" "$startvar" "$extravar" 'extraex:ethtruerunex:ethtrue' +testrun running "$runvar" "$startvar" "$extravar" 'extraif:fdditruerunif:fdditrue' # Startup mode: scratch running, load startup with extra on top -testrun startup "$runvar" "$startvar" "$extravar" 'extraex:ethtruestartupex:ethtrue' +testrun startup "$runvar" "$startvar" "$extravar" 'extraif:fdditruestartupif:fdditrue' # 2. Try different modes on Invalid running/startup/extra WITHOUT failsafe # ensure all db:s are unchanged after failure. diff --git a/test/test_type.sh b/test/test_type.sh index e45a34e0..9a1555fa 100755 --- a/test/test_type.sh +++ b/test/test_type.sh @@ -219,7 +219,6 @@ function testrun(){ $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_type_range.sh b/test/test_type_range.sh index e1f0af6a..aaaf07e1 100755 --- a/test/test_type_range.sh +++ b/test/test_type_range.sh @@ -173,7 +173,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang $dclispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_union.sh b/test/test_union.sh index 431d4c96..4777ef93 100755 --- a/test/test_union.sh +++ b/test/test_union.sh @@ -17,7 +17,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_when_must.sh b/test/test_when_must.sh index 83bc9a6a..70cd5301 100755 --- a/test/test_when_must.sh +++ b/test/test_when_must.sh @@ -14,7 +14,6 @@ cat < $cfg $cfg /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_with_default.sh b/test/test_with_default.sh index b304ea51..61bb251a 100755 --- a/test/test_with_default.sh +++ b/test/test_with_default.sh @@ -24,7 +24,6 @@ cat < $cfg ietf-netconf:startup 42 /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_xpath_functions.sh b/test/test_xpath_functions.sh index 79bb67cb..e09204f1 100755 --- a/test/test_xpath_functions.sh +++ b/test/test_xpath_functions.sh @@ -18,7 +18,6 @@ cat < $cfg $cfg /usr/local/share/clixon $dir - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang.sh b/test/test_yang.sh index 263ef359..c884a2f4 100755 --- a/test/test_yang.sh +++ b/test/test_yang.sh @@ -16,7 +16,6 @@ cat < $cfg $cfg /usr/local/share/clixon $dir - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang_anydata.sh b/test/test_yang_anydata.sh index 2f2f29ca..07848f90 100755 --- a/test/test_yang_anydata.sh +++ b/test/test_yang_anydata.sh @@ -134,7 +134,6 @@ function testrun() clixon-restconf:allow-auth-none /usr/local/share/clixon $dir - $IETFRFC $dir/yang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang_bind.sh b/test/test_yang_bind.sh index 3fbaf6c2..ad315278 100755 --- a/test/test_yang_bind.sh +++ b/test/test_yang_bind.sh @@ -28,7 +28,6 @@ cat < $cfg $cfg /usr/local/share/clixon $dir - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang_default.sh b/test/test_yang_default.sh index fb1fe049..35587c7b 100755 --- a/test/test_yang_default.sh +++ b/test/test_yang_default.sh @@ -21,7 +21,6 @@ cat < $cfg ietf-netconf:startup 42 /usr/local/share/clixon - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/backend diff --git a/test/test_yang_deviation.sh b/test/test_yang_deviation.sh index d4749b32..54481823 100755 --- a/test/test_yang_deviation.sh +++ b/test/test_yang_deviation.sh @@ -20,7 +20,6 @@ cat < $cfg $cfg /usr/local/share/clixon $dir - $IETFRFC $dir /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang_extension.sh b/test/test_yang_extension.sh index 2e8933c2..de29cc7f 100755 --- a/test/test_yang_extension.sh +++ b/test/test_yang_extension.sh @@ -30,7 +30,6 @@ cat < $cfg $cfg /usr/local/share/clixon $dir - $IETFRFC $fyang /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh index d0f11062..64185f37 100755 --- a/test/test_yang_load.sh +++ b/test/test_yang_load.sh @@ -62,7 +62,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang1 /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/var/$APPNAME/$APPNAME.pidfile @@ -115,7 +114,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang2 /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/var/$APPNAME/$APPNAME.pidfile @@ -163,7 +161,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC example /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/var/$APPNAME/$APPNAME.pidfile @@ -206,7 +203,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC example $OLDDATE /usr/local/var/$APPNAME/$APPNAME.sock @@ -251,7 +247,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $dir /usr/local/var/$APPNAME/$APPNAME.sock /usr/local/var/$APPNAME/$APPNAME.pidfile @@ -296,7 +291,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $dir $fyang2 /usr/local/var/$APPNAME/$APPNAME.sock @@ -341,7 +335,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $dir example $OLDDATE @@ -387,7 +380,6 @@ cat < $cfg $cfg $dir /usr/local/share/clixon - $IETFRFC $fyang2 example $NEWDATE diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh index 5da0d545..2b557196 100755 --- a/test/test_yang_namespace.sh +++ b/test/test_yang_namespace.sh @@ -22,7 +22,6 @@ cat < $cfg clixon-restconf:allow-auth-none $dir /usr/local/share/clixon - $IETFRFC /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME