Set oui as primary key for OUI model

python/nav/models/oui.py

@@ -6,8 +6,8 @@
 class OUI(models.Model):
     """Defines an OUI and the name of the vendor the OUI belongs to"""
 
+    oui = models.CharField(max_length=17, primary_key=True)
     vendor = VarcharField()
-    oui = models.CharField(max_length=17, unique=True)
 
     def __str__(self):
         return self.oui

python/nav/models/sql/changes/sc.05.10.0002.sql

@@ -1,6 +1,5 @@
 CREATE TABLE manage.oui (
-    id SERIAL PRIMARY KEY,
+    oui MACADDR PRIMARY KEY,
     vendor VARCHAR NOT NULL,
-    oui MACADDR NOT NULL UNIQUE,
     CHECK (oui=trunc(oui))
 );

tests/integration/models/oui_test.py

@@ -22,14 +22,12 @@ def valid_oui():
     oui = "aa:bb:cc:00:00:00"
     instance = OUI(oui=oui, vendor="myvendor")
     yield instance
-    if instance.id:
-        instance.delete()
+    instance.delete()
 
 
 @pytest.fixture()
 def invalid_oui():
     oui = "aa:bb:cc:dd:ee:ff"
     instance = OUI(oui=oui, vendor="myvendor")
     yield instance
-    if instance.id:
-        instance.delete()
+    instance.delete()