Add virt_lan_settings and virt_lan_member_settings for storing

arbitrary interface settings associated with the virtual part of the
topology.

sql/database-create.sql

@@ -1581,6 +1581,33 @@ CREATE TABLE virt_agents (
   PRIMARY KEY  (pid,eid,vname,vnode)
 ) TYPE=MyISAM;
 
+--
+-- Table structure for table `virt_lan_member_settings`
+--
+
+CREATE TABLE virt_lan_member_settings (
+  pid varchar(12) NOT NULL default '',
+  eid varchar(32) NOT NULL default '',
+  vname varchar(32) NOT NULL default '',
+  member varchar(32) NOT NULL default '',
+  capkey varchar(32) NOT NULL default '',
+  capval varchar(64) NOT NULL default '',
+  PRIMARY KEY  (pid,eid,vname,member,capkey)
+) TYPE=MyISAM;
+
+--
+-- Table structure for table `virt_lan_settings`
+--
+
+CREATE TABLE virt_lan_settings (
+  pid varchar(12) NOT NULL default '',
+  eid varchar(32) NOT NULL default '',
+  vname varchar(32) NOT NULL default '',
+  capkey varchar(32) NOT NULL default '',
+  capval varchar(64) NOT NULL default '',
+  PRIMARY KEY  (pid,eid,vname,capkey)
+) TYPE=MyISAM;
+
 --
 -- Table structure for table `virt_lans`
 --

sql/database-fill.sql

@@ -603,7 +603,17 @@ REPLACE INTO table_regex VALUES ('experiments','expt_name','text','redirect','de
 REPLACE INTO table_regex VALUES ('experiments','noswap_reason','text','redirect','default:tinytext',1,255,NULL);
 REPLACE INTO table_regex VALUES ('experiments','noidleswap_reason','text','redirect','default:tinytext',1,255,NULL);
 REPLACE INTO table_regex VALUES ('experiments','idleswap_timeout','int','redirect','default:int',1,2147483647,NULL);
-REPLACE INTO table_regex VALUES ('experiments','autoswap_timeout','int','redirect','default:int',1,2147483647,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_settings','pid','text','redirect','projects:pid',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_settings','eid','text','redirect','experiments:eid',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_settings','vname','text','redirect','virt_lans:vname',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_settings','capkey','text','regex','^[-\\w]+$',1,32,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_settings','capval','text','regex','^[-\\w\\.:+]+$',1,64,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','pid','text','redirect','projects:pid',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','eid','text','redirect','experiments:eid',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','vname','text','redirect','virt_lan_settings:vname',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','member','text','redirect','virt_lans:member',1,32,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','capkey','text','redirect','virt_lan_settings:capkey',0,0,NULL);
+REPLACE INTO table_regex VALUES ('virt_lan_member_settings','capval','text','redirect','virt_lan_settings:capval',0,0,NULL);
 
 --
 -- Dumping data for table `testsuite_preentables`

sql/database-migrate.txt

@@ -1450,3 +1450,27 @@ last_net_act,last_cpu_act,last_ext_act);
 	  PRIMARY KEY  (node_id,iface,capkey),
           KEY node_id (node_id)
 	) TYPE=MyISAM;
+
+1.238: Add virt_lan_settings and virt_lan_member_settings for storing
+       arbitrary interface settings associated with the virtual part
+       of the topology. 
+
+	CREATE TABLE virt_lan_member_settings (
+	  pid varchar(12) NOT NULL default '',
+	  eid varchar(32) NOT NULL default '',
+	  vname varchar(32) NOT NULL default '',
+	  member varchar(32) NOT NULL default '',
+	  capkey varchar(32) NOT NULL default '',
+	  capval varchar(64) NOT NULL default '',
+	  PRIMARY KEY  (pid,eid,vname,member,capkey)
+	) TYPE=MyISAM;
+
+	CREATE TABLE virt_lan_settings (
+	  pid varchar(12) NOT NULL default '',
+	  eid varchar(32) NOT NULL default '',
+	  vname varchar(32) NOT NULL default '',
+	  capkey varchar(32) NOT NULL default '',
+	  capval varchar(64) NOT NULL default '',
+	  PRIMARY KEY  (pid,eid,vname,capkey)
+	) TYPE=MyISAM;
+