Merge pull request #3 from sandwichcloud/gatewaydns

add gateway and dns servers to network

ingredients_db/alembic/versions/9d6460001e00_create_network.py

@@ -27,6 +27,8 @@ def upgrade():
         sa.Column('current_task_id', sau.UUIDType, sa.ForeignKey('tasks.id')),
 
         sa.Column('port_group', sa.String, unique=True, nullable=False),
+        sa.Column('gateway', sau.IPAddressType, nullable=False),
+        sa.Column('dns_servers', sa.ARRAY(sau.IPAddressType), nullable=False),
 
         sa.Column('state', sa.Enum(NetworkState), default=NetworkState.CREATING, nullable=False),
 

ingredients_db/models/network.py

@@ -3,6 +3,7 @@
 from typing import Optional
 
 from sqlalchemy import Column, String, Enum, text
+from sqlalchemy.dialects.postgresql import ARRAY
 from sqlalchemy_utils import UUIDType, generic_repr, IPAddressType, ArrowType
 
 from ingredients_db.database import Base
@@ -27,6 +28,8 @@ class Network(Base, TaskMixin):
     name = Column(String, unique=True, nullable=False)
 
     port_group = Column(String, unique=True, nullable=False)
+    gateway = Column(IPAddressType, nullable=False)
+    dns_servers = Column(ARRAY(IPAddressType), nullable=False)
 
     state = Column(Enum(NetworkState), default=NetworkState.CREATING, nullable=False)
 
@@ -47,6 +50,14 @@ def next_free_address(self, session) -> Optional[ipaddress.IPv4Address]:
             start_host = ipaddress.IPv4Address(self.pool_start)
             end_host = ipaddress.IPv4Address(self.pool_end)
 
+            if host == self.gateway:
+                # Skip the gateway
+                continue
+
+            if host in self.dns_servers:
+                # Skip dns servers if in range
+                continue
+
             if start_host <= host <= end_host:
                 ip_addresses.append(host)