Test: remove obsolete test_ openconfig_system
Add branch with-defaults to github workflow Check in parameter in yang_extension_value
This commit is contained in:
Olof hagsand
parent
4514f2a538
commit
aaa18897ef
4 changed files with 11 additions and 183 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
|
@ -2,9 +2,9 @@ name: Clixon CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master, callhome ]
|
branches: [ master, callhome, with-defaults ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ master, callhome ]
|
branches: [ master, callhome, with-defaults ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
|
||||||
|
|
@ -3656,6 +3656,10 @@ yang_extension_value(yang_stmt *ys,
|
||||||
cbuf *cb = NULL;
|
cbuf *cb = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (ys == NULL){
|
||||||
|
clicon_err(OE_YANG, EINVAL, "ys is NULL");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
if (exist)
|
if (exist)
|
||||||
*exist = 0;
|
*exist = 0;
|
||||||
if ((cb = cbuf_new()) == NULL){
|
if ((cb = cbuf_new()) == NULL){
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,11 @@ Run all tests but continue after errors and only print a summary test output ide
|
||||||
sum.sh
|
sum.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Add a detailed error print of the first test that failed, if any:
|
||||||
|
```
|
||||||
|
detail=true sum.sh
|
||||||
|
```
|
||||||
|
|
||||||
## Memory leak test
|
## Memory leak test
|
||||||
The `mem.sh` runs memory checks using valgrind. Start it with no arguments to test all components (backend, restconf, cli, netconf), or specify which components to run:
|
The `mem.sh` runs memory checks using valgrind. Start it with no arguments to test all components (backend, restconf, cli, netconf), or specify which components to run:
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -1,181 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Run a system around openconfig interface, ie: openconfig-if-ethernet
|
|
||||||
# Note first variant uses ietf-interfaces, maybe remove this?
|
|
||||||
|
|
||||||
# Magic line must be first in script (see README.md)
|
|
||||||
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
|
|
||||||
|
|
||||||
echo "...skipped: wrong"
|
|
||||||
if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
|
||||||
|
|
||||||
new "openconfig"
|
|
||||||
if [ ! -d "$OPENCONFIG" ]; then
|
|
||||||
# err "Hmm Openconfig dir does not seem to exist, try git clone https://github.com/openconfig/public?"
|
|
||||||
echo "...skipped: OPENCONFIG not set"
|
|
||||||
if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
OCDIR=$OPENCONFIG/release/models
|
|
||||||
|
|
||||||
# Generate autocli for these modules
|
|
||||||
AUTOCLI=$(autocli_config clixon-example kw-nokey false)
|
|
||||||
|
|
||||||
cat <<EOF > $cfg
|
|
||||||
<clixon-config xmlns="http://clicon.org/config">
|
|
||||||
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
|
|
||||||
<CLICON_FEATURE>ietf-netconf:startup</CLICON_FEATURE>
|
|
||||||
<CLICON_YANG_DIR>${YANG_INSTALLDIR}</CLICON_YANG_DIR>
|
|
||||||
<CLICON_YANG_DIR>$OCDIR</CLICON_YANG_DIR>
|
|
||||||
<CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
|
|
||||||
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
|
|
||||||
<CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
|
|
||||||
<CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
|
|
||||||
<CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
|
|
||||||
<CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
|
|
||||||
<CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
|
|
||||||
<CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
|
|
||||||
${AUTOCLI}
|
|
||||||
</clixon-config>
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# First using ietf-interfaces (not openconfig-interfaces)
|
|
||||||
# Example yang
|
|
||||||
cat <<EOF > $fyang
|
|
||||||
module clixon-example{
|
|
||||||
yang-version 1.1;
|
|
||||||
namespace "urn:example:example";
|
|
||||||
prefix ex;
|
|
||||||
|
|
||||||
import openconfig-system {
|
|
||||||
prefix oc-sys;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Example system
|
|
||||||
cat <<EOF > $dir/startup_db
|
|
||||||
<config>
|
|
||||||
</config>
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if [ $BE -ne 0 ]; then
|
|
||||||
new "kill old backend"
|
|
||||||
sudo clixon_backend -zf $cfg
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
err
|
|
||||||
fi
|
|
||||||
sudo pkill -f clixon_backend # to be sure
|
|
||||||
|
|
||||||
new "start backend -s startup -f $cfg"
|
|
||||||
start_backend -s startup -f $cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
new "wait backend"
|
|
||||||
wait_backend
|
|
||||||
|
|
||||||
new "$clixon_cli -D $DBG -1f $cfg 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<rpc $DEFAULTNS><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><data><interfaces xmlns=\"http://openconfig.net/yang/interfaces\"><interface><name>e</name><config><name>e</name><type>ex:eth</type><loopback-mode>false</loopback-mode><enabled>true</enabled></config><hold-time><config><up>0</up><down>0</down></config></hold-time></interface></interfaces></data></rpc-reply>]]>]]>"
|
|
||||||
|
|
||||||
new "cli show configuration"
|
|
||||||
expectpart "$($clixon_cli -1 -f $cfg show conf xml)" 0 "^<interfaces xmlns=\"http://openconfig.net/yang/interfaces\">" --not-- "<oc-eth:ethernet xmlns:oc-eth=\"http://openconfig.net/yang/interfaces/ethernet\">"
|
|
||||||
|
|
||||||
new "cli set interfaces interface <tab> complete: e"
|
|
||||||
expectpart "$(echo "set interfaces interface " | $clixon_cli -f $cfg)" 0 "interface e"
|
|
||||||
|
|
||||||
# XXX See https://github.com/clicon/clixon/issues/218
|
|
||||||
#new "cli set interfaces interface e <tab> complete: not ethernet"
|
|
||||||
#expectpart "$(echo "set interfaces interface e " | $clixon_cli -f $cfg)" 0 config hold-time subinterfaces --not-- ethernet
|
|
||||||
|
|
||||||
if [ $BE -ne 0 ]; then
|
|
||||||
new "Kill backend"
|
|
||||||
# Check if premature kill
|
|
||||||
pid=$(pgrep -u root -f clixon_backend)
|
|
||||||
if [ -z "$pid" ]; then
|
|
||||||
err "backend already dead"
|
|
||||||
fi
|
|
||||||
# kill backend
|
|
||||||
stop_backend -f $cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Second using openconfig-interfaces instead
|
|
||||||
# Example yang
|
|
||||||
cat <<EOF > $fyang
|
|
||||||
module clixon-example{
|
|
||||||
yang-version 1.1;
|
|
||||||
namespace "urn:example:example";
|
|
||||||
prefix ex;
|
|
||||||
|
|
||||||
import openconfig-vlan {
|
|
||||||
prefix oc-vlan;
|
|
||||||
}
|
|
||||||
import openconfig-if-ethernet {
|
|
||||||
prefix oc-eth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Example system
|
|
||||||
cat <<EOF > $dir/startup_db
|
|
||||||
<config>
|
|
||||||
<interfaces xmlns="http://openconfig.net/yang/interfaces">
|
|
||||||
<interface>
|
|
||||||
<name>eth1</name>
|
|
||||||
<config>
|
|
||||||
<name>eth1</name>
|
|
||||||
<type>ianaift:ethernetCsmacd</type>
|
|
||||||
<mtu>9206</mtu>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
<oc-vlan:tpid xmlns:oc-vlan="http://openconfig.net/yang/vlan">oc-vlan-types:TPID_0X8100</oc-vlan:tpid>
|
|
||||||
</config>
|
|
||||||
<oc-eth:ethernet xmlns:oc-eth="http://openconfig.net/yang/interfaces/ethernet">
|
|
||||||
<oc-eth:config>
|
|
||||||
<oc-eth:mac-address>2c:53:4a:09:59:73</oc-eth:mac-address>
|
|
||||||
</oc-eth:config>
|
|
||||||
</oc-eth:ethernet>
|
|
||||||
</interface>
|
|
||||||
</interfaces>
|
|
||||||
</config>
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if [ $BE -ne 0 ]; then
|
|
||||||
new "kill old backend"
|
|
||||||
sudo clixon_backend -zf $cfg
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
err
|
|
||||||
fi
|
|
||||||
sudo pkill -f clixon_backend # to be sure
|
|
||||||
|
|
||||||
new "start backend -s startup -f $cfg"
|
|
||||||
start_backend -s startup -f $cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
new "wait backend"
|
|
||||||
wait_backend
|
|
||||||
|
|
||||||
new "$clixon_cli -D $DBG -1f $cfg show version"
|
|
||||||
expectpart "$($clixon_cli -D $DBG -1f $cfg show version)" 0 "${CLIXON_VERSION}"
|
|
||||||
|
|
||||||
if [ $BE -ne 0 ]; then
|
|
||||||
new "Kill backend"
|
|
||||||
# Check if premature kill
|
|
||||||
pid=$(pgrep -u root -f clixon_backend)
|
|
||||||
if [ -z "$pid" ]; then
|
|
||||||
err "backend already dead"
|
|
||||||
fi
|
|
||||||
# kill backend
|
|
||||||
stop_backend -f $cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
rm -rf $dir
|
|
||||||
|
|
||||||
new "endtest"
|
|
||||||
endtest
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue