Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for hosts in nextsubnet. Fixes #23 #24

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Check for hosts in nextsubnet. Fixes #23 #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4caa4f
Check for hosts in nextsubnet. Fixes #23
kd7lxl Jun 2, 2020
5285c40
Merge branch 'master' into hosts-in-subnet
dpkingston Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions portal/management/commands/nextsubnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from ipaddr import IPNetwork
from optparse import make_option

from django.core.management.base import BaseCommand, CommandError
from portal.models import Subnet
from portal.models import IPAddress, Subnet


prefixlenq = Subnet.objects.extra(select={'masklen': "masklen(network)"}
Expand All @@ -12,10 +13,14 @@ def get_next_network(address, prefixlen):
return IPNetwork("/".join(map(str, [address, prefixlen])))


def find_free_network(existing_networks, start, prefixlen):
def find_free_network(existing_networks, start, prefixlen, ignore_hosts=False):
new_network = get_next_network(start, prefixlen)
for net in existing_networks:
if new_network in net or net in new_network:
if any([
new_network in net,
net in new_network,
not ignore_hosts and IPAddress.objects.extra(where=["ip <<= inet '%s'" % new_network]),
]):
return find_free_network(existing_networks,
max(new_network) + 1,
prefixlen)
Expand All @@ -28,6 +33,14 @@ class Command(BaseCommand):
'\nSuggested block names:\n ' + \
'\n '.join(prefixlenq.values_list('notes', flat=True)[:10]) + \
'\nBlock names use case-insensitive starts-with matching.'
option_list = BaseCommand.option_list + (
make_option(
'--ignore-hosts',
action='store_true',
dest='ignore_hosts',
default=False,
help='Skips checking for any hosts in the new subnet'),
)

def handle(self, *args, **options):
blockname, prefixlen = args
Expand All @@ -40,7 +53,8 @@ def handle(self, *args, **options):
[n.network for n in Subnet.objects.extra(
where=["inet '%s' >> network" % block])],
min(block),
prefixlen)
prefixlen,
options.get("ignore_hosts"))
if found not in block:
raise CommandError(
"No /%ss available in %s" % (prefixlen, str(block)))
Expand Down
Loading