All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit c10f718a authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor fixes to uselatestwadata stuff now that test suite is running

again. No biggie.
parent 6d881a09
......@@ -176,6 +176,9 @@ namespace eval GLOBALS {
# These are going to be default values within the NS file.
variable default_ip_routing_type "none"
# For remote nodes. Use latest widearea data.
variable uselatestwadata 0
# This is the file handler for the warnings file
variable WARN_FILE [open "$eid.warnings" w]
......
......@@ -284,7 +284,7 @@ Simulator instproc run {} {
var_import ::GLOBALS::DB
var_import ::GLOBALS::impotent
var_import ::GLOBALS::vtypes
var_import ::TBCOMPAT::uselatestwadata
var_import ::GLOBALS::uselatestwadata
# Fill out IPs
foreach obj [concat [array names lanlink_list]] {
......
......@@ -21,9 +21,6 @@ namespace eval TBCOMPAT {
# This is the default weight for a hard vtype.
variable default_hard_vtype_weight 1.0
# For remote nodes. Use latest info.
variable uselatestwadata 0
# This is a general procedure that takes a node, an object (lan or link)
# it is connected to, and an IP address, and sets the IP address
# for the node on that object. It checks both the validity of the
......@@ -371,6 +368,7 @@ proc tb-fix-node {vnode pnode} {
proc tb-make-soft-vtype {name types} {
var_import ::TBCOMPAT::hwtypes
var_import ::TBCOMPAT::isremote
var_import ::GLOBALS::vtypes
var_import ::TBCOMPAT::default_soft_vtype_weight
......@@ -387,6 +385,7 @@ proc tb-make-soft-vtype {name types} {
proc tb-make-hard-vtype {name types} {
var_import ::TBCOMPAT::hwtypes
var_import ::TBCOMPAT::isremote
var_import ::GLOBALS::vtypes
var_import ::TBCOMPAT::default_hard_vtype_weight
......@@ -403,6 +402,7 @@ proc tb-make-hard-vtype {name types} {
proc tb-make-weighted-vtype {name weight types} {
var_import ::TBCOMPAT::hwtypes
var_import ::TBCOMPAT::isremote
var_import ::GLOBALS::vtypes
var_import ::TBCOMPAT::FLOAT
......@@ -494,7 +494,7 @@ proc tb-set-lan-simplex-params {lan node todelay tobw toloss fromdelay frombw fr
}
proc tb-set-uselatestwadata {onoff} {
var_import ::TBCOMPAT::uselatestwadata
var_import ::GLOBALS::uselatestwadata
if {$onoff != 0 && $onoff != 1} {
perror "\[tb-set-uselatestwadata] $onoff must be 0/1"
......
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