portal-gui no longer invokes the myrpki.py command line tool.

It now updates the IRDB directly, and notifies rpkid to immediately
perform an update, rather than waiting for the next cron job to cycle.

added a 'valid_until' field to the Child model, to store the end of
the RPKI resource certificate validity period.

change load_csv.py and list_resources.py to use the code for locating
rpki.conf in rpki.config rather than duplicating it locally.

fixed bug in AddressRange model in function as_resource_range() where
IPv4 addresses were returned as IPv6.


svn path=/portal-gui/templates/myrpki/child_view.html; revision=3694

2 files changed, 10 insertions, 8 deletions

diff --git a/portal-gui/templates/myrpki/child_view.html b/portal-gui/templates/myrpki/child_view.html
index 0721cc65..9bcdf948 100644
--- a/portal-gui/templates/myrpki/child_view.html
+++ b/portal-gui/templates/myrpki/child_view.html
@@ -3,28 +3,29 @@
 {% block content %}
 <p>Handle: <a href="{% url rpki.gui.app.views.dashboard %}">{{ request.session.handle.handle }}</a>
 <h1>Child View</h1>
-<p>Child: {{ child.handle }}
+<p>Child: {{ child.handle }}</p>
+<p>Valid until: {{ child.valid_until }}</p>
 
 <h2>Delegated Addresses</h2>
 {% if child.address_range.all %}
 <ul>
 {% for a in child.address_range.all %}
-<li><a href="{{ a.get_absolute_url }}">{{ a }}</a>
+<li><a href="{{ a.get_absolute_url }}">{{ a }}</a></li>
 {% endfor %}
 </ul>
 {% else %}
-<p>--none--
+<p>--none--</p>
 {% endif %}
 
 <h2>Delegated ASNs</h2>
 {% if child.asn.all %}
 <ul>
 {% for a in child.asn.all %}
-<li><a href="{{ a.get_absolute_url }}">{{ a }}</a>
+<li><a href="{{ a.get_absolute_url }}">{{ a }}</a></li>
 {% endfor %}
 </ul>
 {% else %}
-<p>--none--
+<p>--none--</p>
 {% endif %}
 
 {% endblock %}
diff --git a/portal-gui/templates/myrpki/dashboard.html b/portal-gui/templates/myrpki/dashboard.html
index 116ea792..dea03c31 100644
--- a/portal-gui/templates/myrpki/dashboard.html
+++ b/portal-gui/templates/myrpki/dashboard.html
@@ -54,18 +54,19 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% if request.session.handle.children.all %}
 <ul>
 {% for child in request.session.handle.children.all %}
-<li><a href="{% url rpki.gui.app.views.child_view child.handle %}">{{ child.handle }}</a>
+<li><a href="{% url rpki.gui.app.views.child_view child.handle %}">{{ child.handle }}</a>, valid until {{ child.valid_until }}
 {% if child.address_range.count or child.asn.count %}
 <p>Delegated resources:
 <ul>
 {% for asn in child.asn.all %}
-<li><a href="{{ asn.get_absolute_url }}">{{ asn }}</a>
+<li><a href="{{ asn.get_absolute_url }}">{{ asn }}</a></li>
 {% endfor %}
 {% for address in child.address_range.all %}
-<li><a href="{{ address.get_absolute_url}}">{{ address }}</a>
+<li><a href="{{ address.get_absolute_url}}">{{ address }}</a></li>
 {% endfor %}
 </ul>
 {% endif %}
+</li>
 {% endfor %}
 </ul>
 <!--