Fix constraints and column types

Refs agdsn#330
lukasjuhrich · Oct 6, 2019 · ac23af2 · ac23af2
1 parent 51505a3
commit ac23af2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/pycroft/model/nat.py b/pycroft/model/nat.py
@@ -1,14 +1,17 @@
 from sqlalchemy import CheckConstraint, Column, ForeignKey, \
-    ForeignKeyConstraint, Integer, SmallInteger, String, Table, Text, \
-    UniqueConstraint, text, func, and_
+    Integer, SmallInteger, String, Text, \
+    UniqueConstraint, func, and_
 from sqlalchemy.orm import relationship, backref
 
 from pycroft.model.base import IntegerIdModel, ModelBase
-from pycroft.model.net import Subnet
-from pycroft.model.types import IPAddress, MACAddress
+from pycroft.model.types import IPAddress, MACAddress, IPNetwork
 from pycroft.model.user import User
 
 
+def single_ipv4_constraint(col: Column):
+    return CheckConstraint(and_(func.family(col) == 4, func.masklen(col) == 32))
+
+
 class NATDomain(IntegerIdModel):
     name = Column(String, nullable=False)
 
@@ -22,7 +25,7 @@ class DHCPHostReservation(ModelBase):
     mac = Column(MACAddress, nullable=False)
 
     __table_args__ = (
-        CheckConstraint(and_(func.family(ip) == 4, func.masklen(ip) == 32)),
+        single_ipv4_constraint(col=ip),
     )
 
 
@@ -31,7 +34,7 @@ class InsideNetwork(ModelBase):
                            nullable=False)
     nat_domain = relationship(NATDomain)
 
-    ip_network = Column(Subnet, primary_key=True, nullable=False)
+    ip_network = Column(IPNetwork, primary_key=True, nullable=False)
     gateway = Column(IPAddress, nullable=False)
 
     __table_args__ = (
@@ -49,8 +52,7 @@ class OutsideIPAddress(ModelBase):
     owner = Column(Integer)
 
     __table_args__ = (
-        CheckConstraint(
-            '(family(ip_address) = 4) AND (masklen(ip_address) = 32)'),
+        single_ipv4_constraint(col=ip_address),
     )
 
 
@@ -60,15 +62,15 @@ class Translation(ModelBase):
     nat_domain = relationship(NATDomain)
 
     outside_address = Column(IPAddress, primary_key=True, nullable=False)
-    inside_network = Column(Subnet, nullable=False)
+    inside_network = Column(IPNetwork, nullable=False)
 
     owner_id = Column(Integer, ForeignKey(User.id, ondelete="CASCADE"),
                       nullable=False)
     owner = relationship(User, backref=backref("translations",
                                                cascade="all, delete-orphan"))
 
     __table_args__ = (
-        CheckConstraint(and_(func.family(ip) == 4, func.masklen(ip) == 32)),
+        single_ipv4_constraint(col=outside_address),
     )
 
 

diff --git a/tests/factories/nat.py b/tests/factories/nat.py
diff --git a/tests/model/test_nat.py b/tests/model/test_nat.py