ipng/vppcfg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call the correct new location of vppcfg.py

Browse Source
This commit is contained in:
Pim van Pelt
2022-07-18 07:36:14 +00:00
parent 1b5233bac1
commit 18260e3465
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vppcfg/intest/intest.sh
View File

@ -7,6 +7,9 @@
## here should not be used although they can be a source of config inspiration :) ## here should not be used although they can be a source of config inspiration :)
## Run me: ## Run me:
# ./intest.sh 2>&1 | tee intest.out
## In strict mode, any residual diff will be a hard error
# ./intest.sh -strict 2>&1 | tee intest.out # ./intest.sh -strict 2>&1 | tee intest.out
rm -f "intest.exec" rm -f "intest.exec"
@ -16,28 +19,28 @@ STRICT=0
for i in hippo[0-9]*.yaml; do for i in hippo[0-9]*.yaml; do
echo "Clearing: Moving to hippo-empty.yaml" echo "Clearing: Moving to hippo-empty.yaml"
../vppcfg plan -s ../schema.yaml -c hippo-empty.yaml -o /tmp/vppcfg-exec-empty ../vppcfg.py plan -s ../schema.yaml -c hippo-empty.yaml -o /tmp/vppcfg-exec-empty
[ -s /tmp/vppcfg-exec-empty ] && { [ -s /tmp/vppcfg-exec-empty ] && {
cat /tmp/vppcfg-exec-empty >> intest.exec cat /tmp/vppcfg-exec-empty >> intest.exec
vppctl exec /tmp/vppcfg-exec-empty vppctl exec /tmp/vppcfg-exec-empty
} }
for j in hippo[0-9]*.yaml; do for j in hippo[0-9]*.yaml; do
echo " - Moving to $i .. " echo " - Moving to $i .. "
../vppcfg plan -s ../schema.yaml -c $i -o /tmp/vppcfg-exec_$i ../vppcfg.py plan -s ../schema.yaml -c $i -o /tmp/vppcfg-exec_$i
[ -s /tmp/vppcfg-exec_$i ] && { [ -s /tmp/vppcfg-exec_$i ] && {
cat /tmp/vppcfg-exec_$i >> intest.exec cat /tmp/vppcfg-exec_$i >> intest.exec
vppctl exec /tmp/vppcfg-exec_$i vppctl exec /tmp/vppcfg-exec_$i
} }
echo " - Moving from $i to $j" echo " - Moving from $i to $j"
../vppcfg plan -s ../schema.yaml -c $j -o /tmp/vppcfg-exec_${i}_${j} ../vppcfg.py plan -s ../schema.yaml -c $j -o /tmp/vppcfg-exec_${i}_${j}
[ -s /tmp/vppcfg-exec_${i}_${j} ] && { [ -s /tmp/vppcfg-exec_${i}_${j} ] && {
cat /tmp/vppcfg-exec_${i}_${j} >> intest.exec cat /tmp/vppcfg-exec_${i}_${j} >> intest.exec
vppctl exec /tmp/vppcfg-exec_${i}_${j} vppctl exec /tmp/vppcfg-exec_${i}_${j}
} }
echo " - Checking that from $j to $j is empty" echo " - Checking that from $j to $j is empty"
../vppcfg plan -s ../schema.yaml -c $j -o /tmp/vppcfg-exec_${j}_${j}_null ../vppcfg.py plan -s ../schema.yaml -c $j -o /tmp/vppcfg-exec_${j}_${j}_null
[ -s /tmp/vppcfg-exec_${j}_${j}_null ] && { [ -s /tmp/vppcfg-exec_${j}_${j}_null ] && {
echo " - ERROR Transition is not empty" echo " - ERROR Transition is not empty"
cat /tmp/vppcfg-exec_${j}_${j}_null cat /tmp/vppcfg-exec_${j}_${j}_null