* New yang changelog experimental feature for automatic upgrade
* Added modules-state diff parameter to xmldb_get datastore function for startup scenarios. * Allowed Yang extended Xpath functions (syntax only): * re-match, deref, derived-from, derived-from-or-self, enum-value, bit-is-set * XSD regular expression handling of dash(`-`) *: Translate XDS `[xxx\-yyy]` to POSIX `[xxxyyy-]`. * YANG Anydata treated same as Anyxml
This commit is contained in:
Olof hagsand
parent
434f0b930e
commit
3f68cca06c
37 changed files with 1475 additions and 351 deletions
255
test/test_upgrade_changelog.sh
Executable file
255
test/test_upgrade_changelog.sh
Executable file
|
|
@ -0,0 +1,255 @@
|
|||
#!/bin/bash
|
||||
# Auto-upgrade using draft-wang-netmod-module-revision-management
|
||||
# Ways of changes (operation-type) are:
|
||||
# create, delete, move, modify
|
||||
# In this example, example-a has the following changes:
|
||||
# - Create y, delete x, modify host-name, move z
|
||||
# example-b is completely obsoleted
|
||||
|
||||
# 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.xml
|
||||
changelog=$dir/changelog.xml # Module revision changelog
|
||||
changelog2=$dir/changelog2.xml # From draft appendix
|
||||
exa01y=$dir/example-a@2017-12-01.yang
|
||||
exa20y=$dir/example-a@2017-12-20.yang
|
||||
|
||||
# draft-wang-netmod-module-revision-management-01
|
||||
# 3.2.1 and 4.1 example-a revision 2017-12-01
|
||||
cat <<EOF > $exa01y
|
||||
module example-a{
|
||||
yang-version 1.1;
|
||||
namespace "urn:example:a";
|
||||
prefix "a";
|
||||
|
||||
organization "foo.";
|
||||
contact "fo@example.com";
|
||||
description
|
||||
"foo.";
|
||||
|
||||
revision 2017-12-01 {
|
||||
description "Initial revision.";
|
||||
}
|
||||
|
||||
container system {
|
||||
leaf a {
|
||||
type string;
|
||||
description "no change";
|
||||
}
|
||||
leaf x {
|
||||
type string;
|
||||
description "delete";
|
||||
}
|
||||
leaf host-name {
|
||||
type uint32;
|
||||
description "modify type";
|
||||
}
|
||||
leaf z {
|
||||
description "move to alt";
|
||||
type string;
|
||||
}
|
||||
}
|
||||
container alt {
|
||||
}
|
||||
}
|
||||
EOF
|
||||
# 3.2.1 and 4.1 example-a revision 2017-12-20
|
||||
cat <<EOF > $exa20y
|
||||
module example-a{
|
||||
yang-version 1.1;
|
||||
namespace "urn:example:a";
|
||||
prefix "a";
|
||||
|
||||
organization "foo.";
|
||||
contact "fo@example.com";
|
||||
description
|
||||
"foo.";
|
||||
|
||||
revision 2017-12-20 {
|
||||
description "Create y, delete x, modify host-name, move z";
|
||||
}
|
||||
revision 2017-12-01 {
|
||||
description "Initial revision.";
|
||||
}
|
||||
container system {
|
||||
leaf a {
|
||||
type string;
|
||||
description "no change";
|
||||
}
|
||||
leaf host-name {
|
||||
type string;
|
||||
description "modify type";
|
||||
}
|
||||
leaf y {
|
||||
type string;
|
||||
description "create";
|
||||
}
|
||||
}
|
||||
container alt {
|
||||
leaf z {
|
||||
description "move to alt";
|
||||
type string;
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
# Create failsafe db
|
||||
cat <<EOF > $dir/failsafe_db
|
||||
<config>
|
||||
<system xmlns="urn:example:a">
|
||||
<a>Failsafe</a>
|
||||
</system>
|
||||
</config>
|
||||
EOF
|
||||
|
||||
# Create startup db revision example-a and example-b 2017-12-01
|
||||
# this should be automatically upgraded to 2017-12-20
|
||||
cat <<EOF > $dir/startup_db
|
||||
<config>
|
||||
<modules-state xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library">
|
||||
<module-set-id>42</module-set-id>
|
||||
<module>
|
||||
<name>example-a</name>
|
||||
<revision>2017-12-01</revision>
|
||||
<namespace>urn:example:a</namespace>
|
||||
</module>
|
||||
<module>
|
||||
<name>example-b</name>
|
||||
<revision>2017-12-01</revision>
|
||||
<namespace>urn:example:b</namespace>
|
||||
</module>
|
||||
</modules-state>
|
||||
<system xmlns="urn:example:a">
|
||||
<a>dont change me</a>
|
||||
<host-name>modify me</host-name>
|
||||
<x>remove me</x>
|
||||
<z>move me</z>
|
||||
</system>
|
||||
<system-b xmlns="urn:example:b">
|
||||
<b>Obsolete</b>
|
||||
</system-b>
|
||||
</config>
|
||||
EOF
|
||||
|
||||
# Create configuration
|
||||
cat <<EOF > $cfg
|
||||
<clixon-config xmlns="http://clicon.org/config">
|
||||
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
|
||||
<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
|
||||
<CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
|
||||
<CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
|
||||
<CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
|
||||
<CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
|
||||
<CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
|
||||
<CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
|
||||
<CLICON_XMLDB_MODSTATE>true</CLICON_XMLDB_MODSTATE>
|
||||
<CLICON_MODULE_REVISION>true</CLICON_MODULE_REVISION>
|
||||
<CLICON_MODULE_REVISION_CHANGELOG>$changelog</CLICON_MODULE_REVISION_CHANGELOG>
|
||||
<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>
|
||||
</clixon-config>
|
||||
EOF
|
||||
|
||||
# Changelog of example-a:
|
||||
cat <<EOF > $changelog
|
||||
<yang-modules xmlns="http://clicon.org/yang-changelog">
|
||||
<module>
|
||||
<name>example-b</name>
|
||||
<revision>2017-12-01</revision>
|
||||
<!--obsolete-->
|
||||
</module>
|
||||
<module>
|
||||
<name>example-a</name>
|
||||
<revision>2017-12-20</revision>
|
||||
<backward-compatible>true</backward-compatible>
|
||||
<revision-change-log>
|
||||
<index>0001</index>
|
||||
<change-operation>create</change-operation>
|
||||
<data-definition>
|
||||
<target-node>
|
||||
/a:system/a:y;
|
||||
</target-node>
|
||||
</data-definition>
|
||||
</revision-change-log>
|
||||
<revision-change-log>
|
||||
<index>0002</index>
|
||||
<change-operation>delete</change-operation>
|
||||
<data-definition>
|
||||
<target-node>
|
||||
/a:system/a:x;
|
||||
</target-node>
|
||||
</data-definition>
|
||||
</revision-change-log>
|
||||
<revision-change-log>
|
||||
<index>0003</index>
|
||||
<change-operation>modify</change-operation>
|
||||
<data-definition>
|
||||
<target-node>
|
||||
/a:system/a:host-name;
|
||||
</target-node>
|
||||
</data-definition>
|
||||
</revision-change-log>
|
||||
<revision-change-log>
|
||||
<index>0004</index>
|
||||
<change-operation>move</change-operation>
|
||||
<data-definition>
|
||||
<target-node>
|
||||
/a:system/a:z;
|
||||
</target-node>
|
||||
</data-definition>
|
||||
</revision-change-log>
|
||||
</module>
|
||||
</yang-modules>
|
||||
EOF
|
||||
|
||||
# Start new system from old datastore
|
||||
mode=startup
|
||||
|
||||
new "test params: -s $mode -f $cfg"
|
||||
# Bring your own backend
|
||||
if [ $BE -ne 0 ]; then
|
||||
# kill old backend (if any)
|
||||
new "kill old backend"
|
||||
sudo clixon_backend -zf $cfg
|
||||
if [ $? -ne 0 ]; then
|
||||
err
|
||||
fi
|
||||
new "start backend -s $mode -f $cfg"
|
||||
start_backend -s $mode -f $cfg
|
||||
fi
|
||||
new "waiting"
|
||||
sleep $RCWAIT
|
||||
|
||||
new "kill old restconf daemon"
|
||||
sudo pkill -u www-data clixon_restconf
|
||||
|
||||
new "start restconf daemon"
|
||||
start_restconf -f $cfg
|
||||
|
||||
new "waiting"
|
||||
sleep $RCWAIT
|
||||
|
||||
new "Check failsafe (work in progress)"
|
||||
new "Check running db content"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><system xmlns="urn:example:a"><a>Failsafe</a></system></data></rpc-reply>]]>]]>$'
|
||||
|
||||
new "Kill restconf daemon"
|
||||
stop_restconf
|
||||
|
||||
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
|
||||
|
||||
rm -rf $dir
|
||||
fi
|
||||
Loading…
Add table
Add a link
Reference in a new issue