fix policy check for inetnum/routes

This commit is contained in:
xuu 2017-11-08 11:05:00 -07:00
parent 965cf57d26
commit 9a43218a58
No known key found for this signature in database
GPG key ID: 8B3B0604F164E04F
2 changed files with 29 additions and 12 deletions

17
check-pol Executable file
View file

@ -0,0 +1,17 @@
#!/bin/sh
if [ $# -eq 0 ]
then
echo "Usage: $0 COMMIT YOUR-MNT"
exit
fi
BASE="$(realpath "$0")"
BASE="$(dirname "$BASE")"
cd "$BASE" || exit 1
git diff --name-only $1 | while IFS='/' read -ra LINE; do
if [[ "${LINE[0]}" = "data" ]]; then
utils/schema-check/dn42-schema.py policy ${LINE[1]} ${LINE[2]} $2
fi
done

View file

@ -696,7 +696,6 @@ def test_policy(obj_type, name, mntner):
if mntner in mntners:
log.notice("%s has mnt in parent object" %(mntner))
return "PASS"
pass
log.error("%s does not pass checks for %s %s" %(mntner, obj_type, name))
@ -823,6 +822,8 @@ if __name__ == '__main__':
if args["mntner"] is None:
log.fatal("Mntner should be provided")
if args["type"] in ["inetnum","inet6num","route","route6"]:
args["name"] = args["name"].replace("_","/")
status = test_policy(args["type"], args["name"], args["mntner"])
@ -900,4 +901,3 @@ if __name__ == '__main__':
print(" > ", o["route"][0], " ", rlvl, " ", ",".join(o["mnt-by"]))
else:
print(" > ", o["route"][0], " ", rlvl, " ", ",".join(o["mnt-by"]))