1 files changed, 23 insertions, 24 deletions

diff --git a/notes/projects/radius/sql/ippool-schema.sql b/notes/projects/radius/sql/ippool-schema.sql
index 00288b0..d64dfd5 100644
--- a/notes/projects/radius/sql/ippool-schema.sql
+++ b/notes/projects/radius/sql/ippool-schema.sql
@@ -145,8 +145,8 @@ CREATE INDEX
  *  regionId
  *  : reference to the physical region served by the block
  *
- *  active
- *  : assignable to customer if true, disabled/inactive if false
+ *  busyout
+ *  : auto assignable to customer if false, disabled/inactive if false
  *
  *  description
  *  : human readable description of network block
@@ -157,7 +157,7 @@ CREATE TABLE IF NOT EXISTS netblock
    network          CIDR            NOT NULL UNIQUE,
    poolId           INTEGER         NOT NULL,
    regionId         INTEGER,
-   assignable       BOOLEAN         NOT NULL DEFAULT TRUE,
+   busyout          BOOLEAN         NOT NULL DEFAULT TRUE,
    description      VARCHAR(256),
    PRIMARY KEY      ( id ),
    FOREIGN KEY      ( poolId )
@@ -173,7 +173,7 @@ CREATE INDEX
                     ( id,
                       poolId,
                       network,
-                      assignable
+                      busyout
                     );
 
 
@@ -299,7 +299,7 @@ CREATE OR REPLACE FUNCTION ip_before_update
    LANGUAGE         plpgsql
    AS               $$
 DECLARE
-   ipAssignable     BOOLEAN;
+   ipBusyout        BOOLEAN;
 BEGIN
 
    -- prevents IP address from being modified
@@ -309,20 +309,20 @@ BEGIN
 
    -- verifies netblock contains IP address
    IF ( NEW.netblockId != NEW.netblockId ) THEN
-      SELECT        assignable      INTO ipAssignable
+      SELECT        busyout      INTO ipBusyout
          FROM       netblock
          WHERE      id      =   NEW.netblockId
             AND     network >>= NEW.address;
-      IF ipAssignable IS NULL THEN
+      IF ipBusyout IS NULL THEN
          RAISE EXCEPTION 'invalid netblock';
       END IF;
-      IF ipAssignable IS TRUE THEN
+      IF ipBusyout IS FALSE THEN
          PERFORM    id
             FROM    netblock
-            WHERE   assignable IS TRUE
+            WHERE   busyout IS TRUE
                AND  network >>= NEW.address;
          IF FOUND THEN
-            RAISE EXCEPTION 'cannot associate assignable netblock if an unassignable netblock contains IP address';
+            RAISE EXCEPTION 'cannot associate not busy netblock to a busied out netblock contains IP address';
          END IF;
       END IF;
    END IF;
@@ -330,8 +330,6 @@ BEGIN
    -- update timestamp
    IF ( ( OLD.nasId != NEW.nasId ) OR ( OLD.username != NEW.username ) ) THEN
       NEW.modified := current_timestamp;
-   ELSE
-      NEW.modified := OLD.modified;
    END IF;
 
    RETURN NEW;
@@ -409,17 +407,6 @@ BEGIN
       RAISE EXCEPTION 'changing network will orphan existing IP addresses';
    END IF;
 
-   -- updates IP Association of netblock if an update and is now assignable
-   IF ( ( OLD.assignable IS FALSE ) AND ( NEW.assignable IS TRUE ) ) THEN
-      UPDATE        ip
-         SET        netblockId      =   nb.id
-         FROM       ip
-         INNER JOIN netblock        AS  nb
-            ON      nb.network      >>= ip.address
-         WHERE      ip.address      <<= NEW.network
-            AND     nb.assignable   IS  TRUE;
-   END IF;
-
    RETURN NEW;
 END;
 $$;
@@ -432,8 +419,20 @@ CREATE OR REPLACE FUNCTION netblock_after_insert_or_update
    AS               $$
 DECLARE
 BEGIN
+
+   -- updates IP Association of netblock if an update and is now assignable
+   IF ( ( OLD.busyout IS TRUE ) AND ( NEW.busyout IS FALSE ) ) THEN
+      UPDATE        ip
+         SET        netblockId      =   nb.id
+         FROM       ip
+         INNER JOIN netblock        AS  nb
+            ON      nb.network      >>= ip.address
+         WHERE      ip.address      <<= NEW.network
+            AND     nb.busyout      IS  TRUE;
+   END IF;
+
    -- updates IP association of netblock is not assignable
-   IF ( NEW.assignable IS FALSE ) THEN
+   IF ( NEW.busyout IS TRUE ) THEN
       UPDATE        ip
          SET        netblockId = NEW.id
          WHERE      address <<= NEW.network;