dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-06-21 19:25:33 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix errors in policy check

Browse source
This commit is contained in:
xuu 2017-11-08 11:36:05 -07:00
parent 222f466586
commit 0827930818
No known key found for this signature in database
GPG key ID: 8B3B0604F164E04F
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -412,6 +412,7 @@ def inet6range(inet):
ip, mask = inet.split('/') ip, mask = inet.split('/')
mask = int(mask) mask = int(mask)
log.debug(ip)
ip = expand_ipv6(ip) ip = expand_ipv6(ip)
if mask == 128: if mask == 128:
@ -513,7 +514,7 @@ def test_policy(obj_type, name, mntner):
if select == None: if select == None:
pass pass
elif policy[select]["policy"] == "open": elif policy[select].get("policy","closed") == "open":
log.notice("Policy is open for parent object") log.notice("Policy is open for parent object")
return "PASS" return "PASS"
@ -538,7 +539,7 @@ def test_policy(obj_type, name, mntner):
log.error("%s does not have mnt for current object" %(mntner)) log.error("%s does not have mnt for current object" %(mntner))
return status return status
if args["type"] == "inetnum": if args["type"] == "route":
Lnet, Hnet, mask = inetrange(name) Lnet, Hnet, mask = inetrange(name)
else: else:
Lnet, Hnet, mask = inet6range(name) Lnet, Hnet, mask = inet6range(name)
@ -571,7 +572,7 @@ def test_policy(obj_type, name, mntner):
if select == None: if select == None:
pass pass
elif policy[select]["policy"] == "open": elif policy[select].get("policy","closed") == "open":
log.notice("Policy is open for parent object") log.notice("Policy is open for parent object")
return "PASS" return "PASS"
@ -625,7 +626,7 @@ def test_policy(obj_type, name, mntner):
elif select[0]<=k[0] or select[1]>=k[1]: elif select[0]<=k[0] or select[1]>=k[1]:
select = k select = k
if policy[select]["policy"] == "open": if policy[select].get("policy","closed") == "open":
log.notice("Policy is open for parent object") log.notice("Policy is open for parent object")
return "PASS" return "PASS"