Commit 96959fd7 authored by Timothy Stack's avatar Timothy Stack
Browse files

Add some more fields to virt_programs (dir, timeout,

expected_exit_code) that get used by the newer program agent.  Add
virt_user_environment table that stores user config data for an
experiment.
parent 2390deaa
...@@ -2064,6 +2064,9 @@ CREATE TABLE virt_programs ( ...@@ -2064,6 +2064,9 @@ CREATE TABLE virt_programs (
vnode varchar(32) NOT NULL default '', vnode varchar(32) NOT NULL default '',
vname varchar(32) NOT NULL default '', vname varchar(32) NOT NULL default '',
command tinytext, command tinytext,
dir tinytext,
timeout int(10) unsigned default NULL,
expected_exit_code tinyint(4) unsigned default NULL,
PRIMARY KEY (pid,eid,vnode,vname), PRIMARY KEY (pid,eid,vnode,vname),
KEY vnode (vnode) KEY vnode (vnode)
) TYPE=MyISAM; ) TYPE=MyISAM;
...@@ -2121,6 +2124,19 @@ CREATE TABLE virt_trafgens ( ...@@ -2121,6 +2124,19 @@ CREATE TABLE virt_trafgens (
KEY vnode (vnode) KEY vnode (vnode)
) TYPE=MyISAM; ) TYPE=MyISAM;
--
-- Table structure for table `virt_user_environment`
--
CREATE TABLE virt_user_environment (
pid varchar(12) NOT NULL default '',
eid varchar(32) NOT NULL default '',
idx int(10) unsigned NOT NULL auto_increment,
name varchar(255) NOT NULL default '',
value text,
PRIMARY KEY (pid,eid,idx)
) TYPE=MyISAM;
-- --
-- Table structure for table `virt_vtypes` -- Table structure for table `virt_vtypes`
-- --
......
...@@ -707,6 +707,13 @@ REPLACE INTO table_regex VALUES ('virt_node_startloc','loc_y','float','redirect' ...@@ -707,6 +707,13 @@ REPLACE INTO table_regex VALUES ('virt_node_startloc','loc_y','float','redirect'
REPLACE INTO table_regex VALUES ('virt_node_startloc','orientation','float','redirect','default:float',0,0,NULL); REPLACE INTO table_regex VALUES ('virt_node_startloc','orientation','float','redirect','default:float',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','parent','text','regex','^[-\\w\\(\\)]+$',1,64,NULL); REPLACE INTO table_regex VALUES ('eventlist','parent','text','regex','^[-\\w\\(\\)]+$',1,64,NULL);
REPLACE INTO table_regex VALUES ('experiments','delay_capacity','int','redirect','default:tinyint',1,10,NULL); REPLACE INTO table_regex VALUES ('experiments','delay_capacity','int','redirect','default:tinyint',1,10,NULL);
REPLACE INTO table_regex VALUES ('virt_user_environment','pid','text','redirect','projects:pid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_user_environment','eid','text','redirect','experiments:eid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_user_environment','name','text','redirect','^[a-zA-Z][-\\w]+$',0,255,NULL);
REPLACE INTO table_regex VALUES ('virt_user_environment','value','text','redirect','default:text',1,512,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','dir','text','redirect','default:tinytext',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','timeout','int','redirect','default:int',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','expected_exit_code','int','redirect','default:tinyint',0,0,NULL);
-- --
-- Dumping data for table `testsuite_preentables` -- Dumping data for table `testsuite_preentables`
......
...@@ -2493,5 +2493,21 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -2493,5 +2493,21 @@ last_net_act,last_cpu_act,last_ext_act);
alter table webcams add stillimage_URL tinytext; alter table webcams add stillimage_URL tinytext;
1.319: Add some more fields to virt_programs.
\ No newline at end of file alter table virt_programs add dir tinytext;
alter table virt_programs add timeout int(10) unsigned default NULL;
alter table virt_programs add expected_exit_code tinyint(4) unsigned
default NULL;
Add a table for storing user config data that gets turned into
environment variables.
CREATE TABLE virt_user_environment (
pid varchar(12) NOT NULL default '',
eid varchar(32) NOT NULL default '',
idx int(10) unsigned NOT NULL auto_increment,
name varchar(255) NOT NULL default '',
value text,
PRIMARY KEY (pid,eid,idx)
) TYPE=MyISAM;
Supports Markdown
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