From cc99d471906bc817f54733fe9df89e31a6f3bb14 Mon Sep 17 00:00:00 2001
From: Stephen Maunder <stephen.maunder@datainterchange.com>
Date: Wed, 5 Apr 2017 16:14:24 +0100
Subject: [PATCH] Assign IP Address to Interface from Interface List

---
 netbox/dcim/views.py                     |  4 +++-
 netbox/templates/dcim/inc/interface.html | 25 ++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index f2b042599..bfedcc455 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1585,7 +1585,9 @@ def ipaddress_assign(request, pk):
                 return redirect('dcim:device', pk=device.pk)
 
     else:
-        form = forms.IPAddressForm(device)
+        form = forms.IPAddressForm(device, initial={
+            'interface': request.GET.get('interface', None)
+        })
 
     return render(request, 'dcim/ipaddress_assign.html', {
         'device': device,
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 7d7d66c2e..472727e4a 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -59,6 +59,11 @@
                 </button>
             {% endif %}
         {% endif %}
+        {% if perms.ipam.add_ipaddress %}
+            <a href="{% url 'dcim:ipaddress_assign' pk=device.pk %}?interface={{ iface.pk }}" class="btn btn-xs btn-primary">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+            </a>
+        {% endif %}
         {% if perms.dcim.change_interface %}
             {% if not iface.is_virtual %}
                 {% if iface.connection %}
@@ -72,7 +77,7 @@
                         </a>
                     {% endif %}
                     <a href="{% url 'dcim:interfaceconnection_delete' pk=iface.connection.pk %}?device={{ device.pk }}" class="btn btn-danger btn-xs" title="Delete connection">
-                        <i class="glyphicon glyphicon-remove" aria-hidden="true"></i>
+                        <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
                     </a>
                 {% elif iface.circuit_termination and perms.circuits.change_circuittermination %}
                     <button class="btn btn-warning btn-xs interface-toggle connected" disabled="disabled" title="Circuits cannot be marked as planned or connected">
@@ -83,7 +88,7 @@
                     </a>
                 {% else %}
                     <a href="{% url 'dcim:interfaceconnection_add' pk=device.pk %}?interface_a={{ iface.pk }}" class="btn btn-success btn-xs" title="Connect">
-                        <i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
+                        <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i>
                     </a>
                 {% endif %}
             {% endif %}
@@ -104,3 +109,19 @@
         {% endif %}
     </td>
 </tr>
+{% if ip_addresses %}
+    {% for ip in ip_addresses %}
+        {% if ip.interface_id == iface.id %}
+        <tr style="background: #eff">
+            <td></td>
+            <td><a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a></td>
+            <td>{{ ip.vrf|default:"Global" }}</td>
+            <td>{% if device.primary_ip4 == ip or device.primary_ip6 == ip %}
+                    <span class="label label-success">Primary</span>
+                {% endif %}
+            </td>
+          <td colspan="2">{{ ip.description }}</td>
+        </tr>
+        {% endif %}
+    {% endfor %}
+{% endif %}