Commit cae78d1c authored by Leigh Stoller's avatar Leigh Stoller

Add some new roles for modelnet nodes, not currently used. Drop

node_types:isphantom which I added in 1.256 since I decided not to use
it; just use isdynamic instead. Add an isjailed slot to node_types
rather then hardwiring that fact to "pcvm" node type.
parent dbc2dd33
......@@ -884,7 +884,7 @@ CREATE TABLE node_types (
pxe_boot_path text,
isvirtnode tinyint(4) NOT NULL default '0',
ismodelnet tinyint(1) NOT NULL default '0',
isphantom tinyint(1) NOT NULL default '0',
isjailed tinyint(1) NOT NULL default '0',
isdynamic tinyint(1) NOT NULL default '0',
isremotenode tinyint(4) NOT NULL default '0',
issubnode tinyint(4) NOT NULL default '0',
......@@ -1263,10 +1263,11 @@ CREATE TABLE reserved (
eid varchar(32) NOT NULL default '',
rsrv_time timestamp(14) NOT NULL,
vname varchar(32) default NULL,
erole enum('node','virthost','delaynode','simhost') NOT NULL default 'node',
erole enum('node','virthost','delaynode','simhost','modelnet-core','modelnet-edge') NOT NULL default 'node',
simhost_violation tinyint(3) unsigned NOT NULL default '0',
old_pid varchar(12) NOT NULL default '',
old_eid varchar(32) NOT NULL default '',
modelnet_core varchar(32) default NULL,
PRIMARY KEY (node_id),
UNIQUE KEY vname (pid,eid,vname),
KEY old_pid (old_pid,old_eid)
......
......@@ -1744,3 +1744,19 @@ last_net_act,last_cpu_act,last_ext_act);
1.263: I fixed typo in previous revision; nothing to do, skip to next
entry.
1.264: Add some new roles for modelnet nodes, not currently used. Drop
node_types:isphantom which I added in 1.256 since I decided not
to use it; just use isdynamic instead. Add an isjailed slot to
node_types rather then hardwiring that fact to "pcvm" node type.
alter table reserved change erole erole\
enum('node','virthost','delaynode','simhost', \
'modelnet-core','modelnet-edge') \
NOT NULL default 'node';
alter table node_types drop isphantom;
alter table node_types add isjailed tinyint(1) NOT NULL \
default '0' after ismodelnet;
update node_types set isjailed=1 where type='pcvm';
update node_types set isjailed=1 where type='modelnet-edge';
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