Commit 03471f0e authored by Leigh Stoller's avatar Leigh Stoller

Add static-old token to routertype slots.

parent 64bab574
......@@ -157,6 +157,21 @@ CREATE TABLE event_objecttypes (
PRIMARY KEY (idx)
) TYPE=MyISAM;
--
-- Table structure for table `event_groups`
--
CREATE TABLE event_groups (
pid varchar(12) NOT NULL default '',
eid varchar(32) NOT NULL default '',
idx int(10) unsigned NOT NULL auto_increment,
group_name varchar(64) NOT NULL default '',
agent_name varchar(64) NOT NULL default '',
PRIMARY KEY (pid,eid,idx),
KEY group_name (group_name),
KEY agent_name (agent_name)
) TYPE=MyISAM;
--
-- Table structure for table `eventlist`
--
......@@ -958,7 +973,7 @@ CREATE TABLE nodes (
status enum('up','possibly down','down','unpingable') default NULL,
status_timestamp datetime default NULL,
failureaction enum('fatal','nonfatal','ignore') NOT NULL default 'fatal',
routertype enum('none','ospf','static','manual','static-ddijk') NOT NULL default 'none',
routertype enum('none','ospf','static','manual','static-ddijk','static-old') NOT NULL default 'none',
next_pxe_boot_path text,
bios_version varchar(64) default NULL,
eventstate varchar(20) default NULL,
......@@ -1748,7 +1763,7 @@ CREATE TABLE virt_nodes (
vname varchar(32) NOT NULL default '',
type varchar(30) default NULL,
failureaction enum('fatal','nonfatal','ignore') NOT NULL default 'fatal',
routertype enum('none','ospf','static','manual','static-ddijk') NOT NULL default 'none',
routertype enum('none','ospf','static','manual','static-ddijk','static-old') NOT NULL default 'none',
fixed text NOT NULL,
KEY pid (pid,eid,vname)
) TYPE=MyISAM;
......
......@@ -558,7 +558,7 @@ REPLACE INTO table_regex VALUES ('virt_nodes','tarfiles','text','regex','^([-\\w
REPLACE INTO table_regex VALUES ('virt_nodes','vname','text','regex','^[-\\w]+$',1,32,NULL);
REPLACE INTO table_regex VALUES ('virt_nodes','type','text','regex','^[-\\w]*$',0,30,NULL);
REPLACE INTO table_regex VALUES ('virt_nodes','failureaction','text','regex','^(fatal|nonfatal|ignore)$',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_nodes','routertype','text','regex','^(none|ospf|static|manual|static-ddijk)$',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_nodes','routertype','text','regex','^(none|ospf|static|manual|static-ddijk|static-old)$',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_nodes','fixed','text','regex','^[-\\w]*$',0,10,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','pid','text','redirect','projects:pid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','eid','text','redirect','experiments:eid',0,0,NULL);
......
......@@ -1762,3 +1762,16 @@ last_net_act,last_cpu_act,last_ext_act);
update node_types set isjailed=1 where type='modelnet-edge';
1.265: Removed a field I never actually added; skip to next entry.
1.266: Change routertype slots to include token for old centralized
routing calculation (static-old).
alter table nodes change routertype routertype \
enum('none','ospf','static','manual', \
'static-ddijk','static-old') \
NOT NULL default 'none';
alter table virt_nodes change routertype routertype \
enum('none','ospf','static','manual',\
'static-ddijk','static-old') \
NOT NULL default 'none';
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment