diff --git a/bin/import-data b/bin/import-data index efe6960..6af3b9c 100755 --- a/bin/import-data +++ b/bin/import-data @@ -45,7 +45,13 @@ def main(): ASBlock.objects.get(handle="TRA1-ASB"), ASBlock.objects.get(handle="UAB1-ASB") ] - ASNumber + ranges = [ + InetNum.objects.get(handle="TRA1-NET"), + InetNum.objects.get(handle="DEF4-NET"), + InetNum.objects.get(handle="DEF6-NET"), + InetNum.objects.get(handle="UNR1-NET"), + InetNum.objects.get(handle="MAIN4-NET"), + ] data = json.load(args.json) @@ -100,6 +106,14 @@ def main(): obj.name = "Imported Network without admin info" obj.handle = InetNum.genGenericHandle("Unknown Imported Network") obj.description = "Object has been imported from old DB and has not yet been edited" + + for r in ranges: + if network.network_address in r.getNetwork(): + obj.parent_range = r + break + else: + raise ValueError("%s did not fit in any netblock" % network) + obj.save() obj.mnt_by.add(defMnt) diff --git a/rrequests/views.py b/rrequests/views.py index bd21090..4f84af9 100644 --- a/rrequests/views.py +++ b/rrequests/views.py @@ -17,7 +17,7 @@ def listRequests(request): requestedToMe = Request.objects.filter(provider__in=mnts) requests = (requestedFromMe | requestedToMe).order_by("-lastAction") - return render(request, "rrequests/list.html", {"requests": requests, "requestedFromMe": requestedFromMe, "requestedToMe": requestedToMe}) + return render(request, "rrequests/list.html", {"mnts": mnts, "requests": requests, "requestedFromMe": requestedFromMe, "requestedToMe": requestedToMe}) class RrequestCreate(LoginRequiredMixin, FormView): diff --git a/templates/base.html b/templates/base.html index f8ac19c..5125e07 100644 --- a/templates/base.html +++ b/templates/base.html @@ -65,6 +65,7 @@ {% if user.is_authenticated %}
  • Logout
  • {% else %} + Register Login {% endif %} @@ -81,7 +82,7 @@
    {% for message in messages %} - + {% endfor %}
    diff --git a/templates/domains/overview.html b/templates/domains/overview.html index feb445d..8420495 100644 --- a/templates/domains/overview.html +++ b/templates/domains/overview.html @@ -8,6 +8,13 @@
    DNS Overview
    + + + +

    Your Nameservers (New nameserver)

    diff --git a/templates/rrequests/list.html b/templates/rrequests/list.html index 59f3f4a..6c3e40a 100644 --- a/templates/rrequests/list.html +++ b/templates/rrequests/list.html @@ -8,6 +8,12 @@
    Resource Requests
    + {% if not mnts.count %} + + {% endif %}

    Start a new request for resources