Add est_bandwidth and rest_bandwidth to virt_lans, to hold the

estimated bandwidth that will be used on the link/LAN. This can then
be passed to assign, to do less conservative bandwidth allocation.

sql/database-create.sql

@@ -437,21 +437,6 @@ CREATE TABLE images (
   KEY gid (gid)
 ) TYPE=MyISAM;
 
---
--- Table structure for table `interface_types`
---
-
-CREATE TABLE interface_types (
-  type varchar(30) NOT NULL default '',
-  max_speed int(11) default NULL,
-  full_duplex tinyint(1) default NULL,
-  manufacturuer varchar(30) default NULL,
-  model varchar(30) default NULL,
-  ports tinyint(4) default NULL,
-  connector varchar(30) default NULL,
-  PRIMARY KEY  (type)
-) TYPE=MyISAM;
-
 --
 -- Table structure for table `interface_capabilities`
 --
@@ -460,7 +445,7 @@ CREATE TABLE interface_capabilities (
   type varchar(30) NOT NULL default '',
   capkey varchar(64) NOT NULL default '',
   capval varchar(64) NOT NULL default '',
-  PRIMARY KEY  (type, capkey)
+  PRIMARY KEY  (type,capkey)
 ) TYPE=MyISAM;
 
 --
@@ -476,6 +461,21 @@ CREATE TABLE interface_settings (
   KEY node_id (node_id)
 ) TYPE=MyISAM;
 
+--
+-- Table structure for table `interface_types`
+--
+
+CREATE TABLE interface_types (
+  type varchar(30) NOT NULL default '',
+  max_speed int(11) default NULL,
+  full_duplex tinyint(1) default NULL,
+  manufacturuer varchar(30) default NULL,
+  model varchar(30) default NULL,
+  ports tinyint(4) default NULL,
+  connector varchar(30) default NULL,
+  PRIMARY KEY  (type)
+) TYPE=MyISAM;
+
 --
 -- Table structure for table `interfaces`
 --
@@ -1632,6 +1632,7 @@ CREATE TABLE virt_lans (
   vname varchar(32) NOT NULL default '',
   delay float(10,2) default '0.00',
   bandwidth int(10) unsigned default NULL,
+  est_bandwidth int(10) unsigned default NULL,
   lossrate float(10,3) default NULL,
   q_limit int(11) default '0',
   q_maxthresh int(11) default '0',
@@ -1650,6 +1651,7 @@ CREATE TABLE virt_lans (
   mask varchar(15) default '255.255.255.0',
   rdelay float(10,2) default NULL,
   rbandwidth int(10) unsigned default NULL,
+  rest_bandwidth int(10) unsigned default NULL,
   rlossrate float(10,3) default NULL,
   cost float NOT NULL default '1',
   widearea tinyint(4) default '0',

sql/database-migrate.txt

@@ -1511,3 +1511,11 @@ last_net_act,last_cpu_act,last_ext_act);
 	alter table virt_agents change vname \
 		vname varchar(64) NOT NULL default '';
 
+1.242: Add est_bandwidth and rest_bandwidth to virt_lans, to hold the estimated
+       bandwidth that will be used on the link/LAN. This can then be passed to
+       assign, to do less conservative bandwidth allocation.
+
+       alter table virt_lans add est_bandwidth int(10) unsigned \
+	   default NULL after bandwidth;
+       alter table virt_lans add rest_bandwidth int(10) unsigned \
+	   default NULL after rbandwidth;