Commit 5ab4b005 authored by Leigh B. Stoller's avatar Leigh B. Stoller

More changes to previous revision; not working like I want it to.

parent 16ec0770
...@@ -3200,6 +3200,7 @@ CREATE TABLE `vinterfaces` ( ...@@ -3200,6 +3200,7 @@ CREATE TABLE `vinterfaces` (
`iface` varchar(10) default NULL, `iface` varchar(10) default NULL,
`rtabid` smallint(5) unsigned NOT NULL default '0', `rtabid` smallint(5) unsigned NOT NULL default '0',
`vnode_id` varchar(32) default NULL, `vnode_id` varchar(32) default NULL,
`exptidx` int(11) NOT NULL default '0',
`virtlanidx` int(11) NOT NULL default '0', `virtlanidx` int(11) NOT NULL default '0',
`vlanid` int(11) NOT NULL default '0', `vlanid` int(11) NOT NULL default '0',
PRIMARY KEY (`node_id`,`unit`), PRIMARY KEY (`node_id`,`unit`),
......
...@@ -4213,6 +4213,7 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -4213,6 +4213,7 @@ last_net_act,last_cpu_act,last_ext_act);
avoid problems upcoming cutover to new lans stuff. Besides, the avoid problems upcoming cutover to new lans stuff. Besides, the
join hoops we jump through are kinda silly. join hoops we jump through are kinda silly.
alter table vinterfaces add `exptidx` int(10) NOT NULL default '0';
alter table vinterfaces add `virtlanidx` int(11) NOT NULL default '0'; alter table vinterfaces add `virtlanidx` int(11) NOT NULL default '0';
alter table vinterfaces add `vlanid` int(11) NOT NULL default '0'; alter table vinterfaces add `vlanid` int(11) NOT NULL default '0';
...@@ -4223,6 +4224,7 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -4223,6 +4224,7 @@ last_net_act,last_cpu_act,last_ext_act);
and vl.ip=vi.IP left join virt_lan_lans as vll on and vl.ip=vi.IP left join virt_lan_lans as vll on
vll.exptidx=vl.exptidx and vll.vname=vl.vname left join vlans vll.exptidx=vl.exptidx and vll.vname=vl.vname left join vlans
as vn on vn.exptidx=vl.exptidx and vn.virtual=vl.vname set as vn on vn.exptidx=vl.exptidx and vn.virtual=vl.vname set
vi.virtlanidx=vll.idx,vi.vlanid=vn.id; vi.exptidx=r.exptidx,vi.virtlanidx=vll.idx,vi.vlanid=vn.id;
4.139: Change to previous revision; Skip to next entry.
\ No newline at end of file
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
use English; use English;
...@@ -3281,7 +3281,8 @@ sub UploadVlans() ...@@ -3281,7 +3281,8 @@ sub UploadVlans()
"$vidx -> $newid\n"); "$vidx -> $newid\n");
DBQueryFatal("update vinterfaces set vlanid='$newid' ". DBQueryFatal("update vinterfaces set vlanid='$newid' ".
"where virtlanidx='$vidx'") "where virtlanidx='$vidx' and ".
" exptidx='$experiment_idx'");
} }
} }
} }
......
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