Merge branch 'feature-network-oui' into 'master'

Display nic hardware vendor

circle/firewall/models.py

@@ -2,7 +2,7 @@
 
 
 from itertools import islice, chain
 from itertools import islice, chain
 import logging
 import logging
-from netaddr import IPSet
+from netaddr import IPSet, EUI
 
 
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 from django.db import models
 from django.db import models
@@ -706,6 +706,17 @@ class Host(models.Model):
     def get_absolute_url(self):
     def get_absolute_url(self):
         return ('network.host', None, {'pk': self.pk})
         return ('network.host', None, {'pk': self.pk})
 
 
+    @property
+    def eui(self):
+        return EUI(self.mac)
+
+    @property
+    def hw_vendor(self):
+        try:
+            return self.eui.oui.registration().org
+        except:
+            return None
+
 
 
 class Firewall(models.Model):
 class Firewall(models.Model):
     name = models.CharField(max_length=20, unique=True,
     name = models.CharField(max_length=20, unique=True,

circle/network/tables.py

@@ -36,6 +36,9 @@ class GroupTable(Table):
 
 
 class HostTable(Table):
 class HostTable(Table):
     hostname = LinkColumn('network.host', args=[A('pk')])
     hostname = LinkColumn('network.host', args=[A('pk')])
+    mac = TemplateColumn(
+        template_name="network/columns/mac.html"
+    )
 
 
     class Meta:
     class Meta:
         model = Host
         model = Host

circle/network/templates/network/columns/mac.html

+{% load i18n %}
+
+<span title="{% blocktrans with vendor=record.hw_vendor|default:"n/a" %}Vendor: {{vendor}}{% endblocktrans %}">{{ record.mac }}</span>