NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 10:58:37 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix problem of reverse export with prefixes included in bigger ones

Browse Source
This commit is contained in:
rdujardin 2016-07-26 18:23:31 +02:00
parent d4ca076fad
commit e9d6c923d8
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netbox/ipam/models.py
View File

@ -350,10 +350,17 @@ class Prefix(CreatedUpdatedModel):
pslash = int(str(self.prefix).split('/')[1]) pslash = int(str(self.prefix).split('/')[1])
if pslash > 16: if pslash > 16:
pbytes[3]='0'
zslash = 24 zslash = 24
largerPrefix = Prefix.objects.filter(family=4, prefix__net_contains_or_equals=pbytes[0]+'.'+pbytes[1]+'.0.0/16')
if largerPrefix:
pbytes[2]='0'
zslash = 16
else: else:
pbytes[2]='0'
zslash = 16 zslash = 16
if pslash > zslash: if pslash > zslash:
pslash = zslash pslash = zslash
@ -387,6 +394,18 @@ class Prefix(CreatedUpdatedModel):
pslash = int(str(self.prefix).split('/')[1]) pslash = int(str(self.prefix).split('/')[1])
zslash = pslash if pslash % 16 == 0 else pslash/16+16 zslash = pslash if pslash % 16 == 0 else pslash/16+16
pnibbles = pnibbles[:zslash/16] + ['0000'] * (8 - zslash/16)
largerPrefix = Prefix.objects.filter(family=6, prefix__net_contains_or_equals=':'.join(pnibbles)+'/'+str(zslash))
if largerPrefix:
#choper le plus grand
minSlash = 128
for pp in largerPrefix:
ppslash = int(str(pp.prefix).split('/')[1])
if ppslash < minSlash:
minSlash = ppslash
zslash = minSlash
pnibbles = pnibbles[:zslash/16] + ['0000'] * (8 - zslash/16)
for ip in ipaddresses: for ip in ipaddresses:
if ip.hostname: if ip.hostname: