dashboard: add ip and lease for vm list

circle/dashboard/templates/dashboard/vm-list.html

@@ -68,10 +68,20 @@
                 {% trans "Owner" as t %}
                 {% include "dashboard/vm-list/header-link.html" with name=t sort="owner" %}
               </th>
-              {% if user.is_superuser %}<th data-sort="string" class="orderable sortable">
-                {% trans "Node" as t %}
-                {% include "dashboard/vm-list/header-link.html" with name=t sort="node" %}
-              </th>{% endif %}
+              <th data-sort="string" class="orderable sortable">
+                {% trans "Lease" as t %}
+                {% include "dashboard/vm-list/header-link.html" with name=t sort="lease" %}
+              </th>
+              {% if user.is_superuser %}
+                <th data-sort="string" class="orderable sortable">
+                  {% trans "IP address" as t %}
+                  {% include "dashboard/vm-list/header-link.html" with name=t sort="ip_addr" %}
+                </th>
+                <th data-sort="string" class="orderable sortable">
+                  {% trans "Node" as t %}
+                  {% include "dashboard/vm-list/header-link.html" with name=t sort="node" %}
+                </th>
+              {% endif %}
           </tr></thead><tbody>
           {% for i in object_list %}
           <tr class="{% cycle 'odd' 'even' %}" data-vm-pk="{{ i.pk }}">
@@ -93,7 +103,13 @@
               {% endif %}
               {# include "dashboard/_display-name.html" with user=i.owner show_org=True #}
             </td>
+            <td class="lease "data-sort-value="{{ i.lease.name }}">
+              {{ i.lease.name }}
+            </td>
             {% if user.is_superuser %}
+            <td class="ip_addr "data-sort-value="{{ i.ipv4 }}">
+              {{ i.ipv4|default:"-" }}
+            </td>
             <td class="node "data-sort-value="{{ i.node.normalized_name }}">
               {{ i.node.name|default:"-" }}
             </td>
@@ -101,7 +117,7 @@
           </tr>
           {% empty %}
           <tr>
-            <td colspan="5">
+            <td colspan="7">
               {% if request.GET.s %}
                 <strong>{% trans "No result." %}</strong>
               {% else %}

circle/dashboard/views.py

@@ -1875,7 +1875,8 @@ class VmList(LoginRequiredMixin, FilterMixin, ListView):
 
         return queryset.filter(
             **self.get_queryset_filters()).prefetch_related(
-                "owner", "node", "owner__profile").distinct()
+                "owner", "node", "owner__profile", "interface_set", "lease",
+                "interface_set__host").distinct()
 
 
 class NodeList(LoginRequiredMixin, SuperuserRequiredMixin, SingleTableView):

circle/vm/models/instance.py

@@ -513,7 +513,12 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
     def ipv4(self):
         """Primary IPv4 address of the instance.
         """
-        return self.primary_host.ipv4 if self.primary_host else None
+        # return self.primary_host.ipv4 if self.primary_host else None
+        for i in self.interface_set.all():
+            if i.host:
+                return i.host.ipv4
+        return None
+
 
     @property
     def ipv6(self):