add shortname to peers for the new www ui

diff --git a/PLC/Methods/AddPeer.py b/PLC/Methods/AddPeer.py
index 1b4c343..d62f4ff 100644 (file)
--- a/PLC/Methods/AddPeer.py
+++ b/PLC/Methods/AddPeer.py
@@ -9,7 +9,7 @@ from PLC.Auth import Auth
 from PLC.Peers import Peer, Peers
 
 can_update = lambda (field, value): field in \
-             ['peername', 'peer_url', 'key', 'cacert']
+             ['peername', 'peer_url', 'key', 'cacert', 'shortname']
 
 class AddPeer(Method):
     """

diff --git a/PLC/Methods/UpdatePeer.py b/PLC/Methods/UpdatePeer.py
index f45ef7a..ba22838 100644 (file)
--- a/PLC/Methods/UpdatePeer.py
+++ b/PLC/Methods/UpdatePeer.py
@@ -6,7 +6,7 @@ from PLC.Auth import Auth
 from PLC.Peers import Peer, Peers
 
 can_update = lambda (field, value): field in \
-             ['peername', 'peer_url', 'key', 'cacert']
+             ['peername', 'peer_url', 'key', 'cacert', 'shortname']
 
 class UpdatePeer(Method):
     """

diff --git a/PLC/Peers.py b/PLC/Peers.py
index 729fd71..2d464bb 100644 (file)
--- a/PLC/Peers.py
+++ b/PLC/Peers.py
@@ -36,6 +36,7 @@ class Peer(Row):
        'peer_url': Parameter (str, "Peer API URL"),
        'key': Parameter(str, "Peer GPG public key"),
        'cacert': Parameter(str, "Peer SSL public certificate"),
+        'shortname' : Parameter(str, "Peer short name"),
         ### cross refs
         'site_ids': Parameter([int], "List of sites for which this peer is authoritative"),
         'person_ids': Parameter([int], "List of users for which this peer is authoritative"),

diff --git a/migrations/v4-to-v5/migrate.sql b/migrations/v4-to-v5/migrate.sql
index 7aea75b..a8b9296 100644 (file)
--- a/migrations/v4-to-v5/migrate.sql
+++ b/migrations/v4-to-v5/migrate.sql
@@ -101,6 +101,11 @@ select * from mgn_all_views;
 drop view mgn_all_views;
 drop function mgn_drop_all_views ();
 
+----------------------------------------
+-- peers
+----------------------------------------
+ALTER TABLE peers ADD COLUMN shortname TEXT;
+
 ----------------------------------------
 -- nodes
 ----------------------------------------

diff --git a/planetlab5.sql b/planetlab5.sql
index f2d261a..fccc8ac 100644 (file)
--- a/planetlab5.sql
+++ b/planetlab5.sql
@@ -771,13 +771,15 @@ CREATE INDEX initscripts_name_idx ON initscripts (name);
 -- Peers
 CREATE TABLE peers (
     peer_id serial PRIMARY KEY,                                -- Peer identifier
-    peername text NOT NULL,                            -- Peer name
+    peername text UNIQUE NOT NULL,                     -- Peer name
     peer_url text NOT NULL,                            -- (HTTPS) URL of the peer PLCAPI interface
     cacert text,                                       -- (SSL) Public certificate of peer API server
     key text,                                          -- (GPG) Public key used for authentication
+    shortname text,                                    -- abbreviated name for displaying foreign objects
     deleted boolean NOT NULL DEFAULT false
 ) WITH OIDS;
 CREATE INDEX peers_peername_idx ON peers (peername) WHERE deleted IS false;
+CREATE INDEX peers_shortname_idx ON peers (shortname) WHERE deleted IS false;
 
 -- Objects at each peer
 CREATE TABLE peer_site (