dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-10-31 19:50:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

update policy check to be less verbose

Browse source
This commit is contained in:
xuu 2017-12-12 10:12:17 -07:00
parent 85ce0df11f
commit 798c85e55f
No known key found for this signature in database
GPG key ID: 8B3B0604F164E04F
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils/schema-check/dn42-schema.py
View file

@ -505,7 +505,7 @@ def test_policy(obj_type, name, mntner):
elif args["type"] in ["inetnum","inet6num"]: elif args["type"] in ["inetnum","inet6num"]:
log.info("Checking inetnum type") log.info("Checking inetnum type")
lis = find(["mnt-by"], {"@type": "net", "cidr": name}) lis = find(["mnt-by"], {"@type": "net", "cidr": name})
log.info(lis) log.debug(lis)
if len(lis) > 0: if len(lis) > 0:
status = 'FAIL' status = 'FAIL'
@ -528,7 +528,7 @@ def test_policy(obj_type, name, mntner):
log.info([Lnet, Hnet, mask]) log.info([Lnet, Hnet, mask])
lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"], lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"],
{"@type": "net", "@netmin": "le=" + Lnet, "@netmax": "ge=" + Hnet, "@netmask": "lt=" + mask}) {"@type": "net", "@netmin": "le=" + Lnet, "@netmax": "ge=" + Hnet, "@netmask": "lt=" + mask})
log.info(lis) log.debug(lis)
policy = {} policy = {}
select = None select = None
@ -564,7 +564,7 @@ def test_policy(obj_type, name, mntner):
elif args["type"] in ["route","route6"]: elif args["type"] in ["route","route6"]:
log.info("Checking route type") log.info("Checking route type")
lis = find(["mnt-by"], {"@type": "route", args["type"]: name}) lis = find(["mnt-by"], {"@type": "route", args["type"]: name})
log.info(lis) log.debug(lis)
if len(lis) > 0: if len(lis) > 0:
status = 'FAIL' status = 'FAIL'
@ -586,7 +586,7 @@ def test_policy(obj_type, name, mntner):
log.info([Lnet, Hnet, mask]) log.info([Lnet, Hnet, mask])
lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"], lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"],
{"@type": "net", "@netmin": "le=" + Lnet, "@netmax": "ge=" + Hnet, "@netmask": "le=" + mask}) {"@type": "net", "@netmin": "le=" + Lnet, "@netmax": "ge=" + Hnet, "@netmask": "le=" + mask})
log.info(lis) log.debug(lis)
policy = {} policy = {}
select = None select = None
@ -626,7 +626,7 @@ def test_policy(obj_type, name, mntner):
# 1. Check if they already have an object # 1. Check if they already have an object
lis = find(["mnt-by"], {"@type": "aut-num", "@name": name}) lis = find(["mnt-by"], {"@type": "aut-num", "@name": name})
log.info(lis) log.debug(lis)
if len(lis) > 0: if len(lis) > 0:
status = 'FAIL' status = 'FAIL'
@ -683,7 +683,7 @@ def test_policy(obj_type, name, mntner):
# 1. Check if they already have an object # 1. Check if they already have an object
lis = find(["mnt-by"], {"@type": "as-block", "@name": name}) lis = find(["mnt-by"], {"@type": "as-block", "@name": name})
log.info(lis) log.debug(lis)
if len(lis) > 0: if len(lis) > 0:
status = 'FAIL' status = 'FAIL'
@ -704,7 +704,7 @@ def test_policy(obj_type, name, mntner):
log.error("%s should come before %s" %(Lname, Hname)) log.error("%s should come before %s" %(Lname, Hname))
lis = find(["as-block","policy","@as-min","@as-max","mnt-by","mnt-lower"], {"@type": "as-block","@as-min":"le=" + Lasn,"@as-max": "ge=" + Hasn}) lis = find(["as-block","policy","@as-min","@as-max","mnt-by","mnt-lower"], {"@type": "as-block","@as-min":"le=" + Lasn,"@as-max": "ge=" + Hasn})
log.info(lis) log.debug(lis)
policy = {} policy = {}
select = None select = None