experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Made a separate Clixon datastore XML/JSON top-level symbol

Browse source 
* Replaces the hardcoded "config" keyword.
  * Implemented by a compile-time option called `DATASTORE_TOP_SYMBOL` option in clixon_custom.h
* Tests: added endtest to all tests. Removed all premature exits if BE=0
This commit is contained in:
Olof hagsand 2021-03-05 14:15:15 +01:00
parent 2ab90d847b
commit b7991d9b39
132 changed files with 939 additions and 628 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/test_upgrade_interfaces.sh
View file

@ -188,7 +188,7 @@ EOF
# Create startup db revision from 2014-05-08 to be upgraded to 2018-02-20
# This is 2014 syntax
cat <<EOF > $dir/startup_db
<config>
<${DATASTORE_TOP}>
<modules-state xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library">
<module-set-id>42</module-set-id>
<module>
@ -226,7 +226,7 @@ cat <<EOF > $dir/startup_db
<admin-status>testing</admin-status>
</interface>
</interfaces-state>
</config>
</${DATASTORE_TOP}>
EOF
# Create configuration
@ -292,7 +292,7 @@ testrun "$XML"
# This is "2016" syntax
cat <<EOF > $dir/startup_db
<config>
<${DATASTORE_TOP}>
<modules-state xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library">
<module-set-id>42</module-set-id>
<module>
@ -336,7 +336,7 @@ cat <<EOF > $dir/startup_db
<admin-status>testing</admin-status>
</interface>
</interfaces-state>
</config>
</${DATASTORE_TOP}>
EOF
# 2. Upgrade from intermediate 2016-01-01 to 2018-02-20
@ -345,7 +345,7 @@ testrun "$XML"
# Again 2014 syntax
cat <<EOF > $dir/startup_db
<config>
<${DATASTORE_TOP}>
<modules-state xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library">
<module-set-id>42</module-set-id>
<module>
@ -383,7 +383,7 @@ cat <<EOF > $dir/startup_db
<admin-status>testing</admin-status>
</interface>
</interfaces-state>
</config>
</${DATASTORE_TOP}>
EOF
rm $if2018
@ -397,7 +397,9 @@ testrun "$XML"
#new "4. No model at all"
#testrun "$XML"
if [ $BE -ne 0 ]; then
rm -rf $dir
fi
rm -rf $dir
new "endtest"
endtest