Commit 33e38a61 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Banish more delta stuff.

parent c92c4ad4
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group. # Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -73,7 +73,6 @@ Node instproc init {s} { ...@@ -73,7 +73,6 @@ Node instproc init {s} {
$self set cmdline "" $self set cmdline ""
$self set rpms "" $self set rpms ""
$self set startup "" $self set startup ""
$self set deltas ""
$self set tarfiles "" $self set tarfiles ""
$self set failureaction "fatal" $self set failureaction "fatal"
$self set fixed "" $self set fixed ""
...@@ -121,7 +120,6 @@ Node instproc updatedb {DB} { ...@@ -121,7 +120,6 @@ Node instproc updatedb {DB} {
$self instvar cmdline $self instvar cmdline
$self instvar rpms $self instvar rpms
$self instvar startup $self instvar startup
$self instvar deltas
$self instvar iplist $self instvar iplist
$self instvar tarfiles $self instvar tarfiles
$self instvar failureaction $self instvar failureaction
...@@ -167,7 +165,7 @@ Node instproc updatedb {DB} { ...@@ -167,7 +165,7 @@ Node instproc updatedb {DB} {
# create one on the fly and set the type properly. # create one on the fly and set the type properly.
# #
if {$issubnode && $fixed == ""} { if {$issubnode && $fixed == ""} {
$sim spitxml_data "virt_nodes" [list "vname" "type" "ips" "osname" "cmd_line" "rpms" "deltas" "startupcmd" "tarfiles" "fixed" ] [list "host-$self" "pc" "" "" "" "" "" "" "" "" ] $sim spitxml_data "virt_nodes" [list "vname" "type" "ips" "osname" "cmd_line" "rpms" "startupcmd" "tarfiles" "fixed" ] [list "host-$self" "pc" "" "" "" "" "" "" "" ]
$sim spitxml_data "virt_node_desires" [list "vname" "desire" "weight"] [list "host-$self" "hosts-$type" 1.0] $sim spitxml_data "virt_node_desires" [list "vname" "desire" "weight"] [list "host-$self" "hosts-$type" 1.0]
set fixed "host-$self" set fixed "host-$self"
} }
...@@ -187,7 +185,7 @@ Node instproc updatedb {DB} { ...@@ -187,7 +185,7 @@ Node instproc updatedb {DB} {
$self add_routes_to_DB $DB $self add_routes_to_DB $DB
# Update the DB # Update the DB
$sim spitxml_data "virt_nodes" [list "vname" "type" "ips" "osname" "cmd_line" "rpms" "deltas" "startupcmd" "tarfiles" "failureaction" "routertype" "fixed" ] [list $self $type $ipraw $osid $cmdline $rpms $deltas $startup $tarfiles $failureaction $default_ip_routing_type $fixed ] $sim spitxml_data "virt_nodes" [list "vname" "type" "ips" "osname" "cmd_line" "rpms" "startupcmd" "tarfiles" "failureaction" "routertype" "fixed" ] [list $self $type $ipraw $osid $cmdline $rpms $startup $tarfiles $failureaction $default_ip_routing_type $fixed ]
# Put in the desires, too # Put in the desires, too
foreach desire [lsort [array names desirelist]] { foreach desire [lsort [array names desirelist]] {
......
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group. # Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -19,7 +19,6 @@ proc tb-set-lan-loss {lan rate} {} ...@@ -19,7 +19,6 @@ proc tb-set-lan-loss {lan rate} {}
proc tb-set-node-rpms {node args} {} proc tb-set-node-rpms {node args} {}
proc tb-set-node-startup {node cmd} {} proc tb-set-node-startup {node cmd} {}
proc tb-set-node-cmdline {node cmd} {} proc tb-set-node-cmdline {node cmd} {}
proc tb-set-node-deltas {node args} {}
proc tb-set-node-tarfiles {node args} {} proc tb-set-node-tarfiles {node args} {}
proc tb-set-node-lan-delay {node lan delay} {} proc tb-set-node-lan-delay {node lan delay} {}
proc tb-set-node-lan-bandwidth {node lan bw} {} proc tb-set-node-lan-bandwidth {node lan bw} {}
......
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group. # Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -233,13 +233,6 @@ proc tb-set-node-tarfiles {node args} { ...@@ -233,13 +233,6 @@ proc tb-set-node-tarfiles {node args} {
} }
$node set tarfiles [join $tarfiles ";"] $node set tarfiles [join $tarfiles ";"]
} }
proc tb-set-node-deltas {node args} {
if {$args == {}} {
perror "\[tb-set-node-deltas] No deltas given."
return
}
$node set deltas [join $args :]
}
proc tb-set-ip-routing {type} { proc tb-set-ip-routing {type} {
var_import ::GLOBALS::default_ip_routing_type var_import ::GLOBALS::default_ip_routing_type
......
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