Commit 91de4fe3 authored by Mike Hibler's avatar Mike Hibler
Browse files

un-advertised hack to set OSID used for sim experiments.

Used to debug NSE problem without changing standard FBSD image,
may come in handy again.
parent aa9dba78
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2002, 2006 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -69,6 +69,7 @@ NSENode instproc make-simulated {args} { ...@@ -69,6 +69,7 @@ NSENode instproc make-simulated {args} {
NSENode instproc updatedb {DB} { NSENode instproc updatedb {DB} {
$self instvar nseconfig $self instvar nseconfig
$self instvar simcode_present $self instvar simcode_present
var_import ::GLOBALS::sim_osname
# for all the simulated nodes, we need to find out if # for all the simulated nodes, we need to find out if
# they are connected to a real node and if so, find the # they are connected to a real node and if so, find the
...@@ -102,7 +103,7 @@ NSENode instproc updatedb {DB} { ...@@ -102,7 +103,7 @@ NSENode instproc updatedb {DB} {
tb-set-hardware $self pcnsenode tb-set-hardware $self pcnsenode
# NSE code runs only FreeBSD as of now. # NSE code runs only FreeBSD as of now.
$self set osid "FBSD-STD" $self set osid $sim_osname
# The Node class's updatedb method updates the DB # The Node class's updatedb method updates the DB
$self next $DB $self next $DB
......
...@@ -59,6 +59,7 @@ proc tb-bind-parent {sub phys} {} ...@@ -59,6 +59,7 @@ proc tb-bind-parent {sub phys} {}
proc tb-fix-current-resources {onoff} {} proc tb-fix-current-resources {onoff} {}
proc tb-set-encapsulate {onoff} {} proc tb-set-encapsulate {onoff} {}
proc tb-set-vlink-emulation {style} {} proc tb-set-vlink-emulation {style} {}
proc tb-set-sim-os {os} {}
proc tb-set-jail-os {os} {} proc tb-set-jail-os {os} {}
proc tb-set-delay-os {os} {} proc tb-set-delay-os {os} {}
proc tb-set-delay-capacity {cap} {} proc tb-set-delay-capacity {cap} {}
......
...@@ -244,9 +244,10 @@ namespace eval GLOBALS { ...@@ -244,9 +244,10 @@ namespace eval GLOBALS {
# specified vs. unspecified in assign_wrapper # specified vs. unspecified in assign_wrapper
variable vlink_encapsulate "default" variable vlink_encapsulate "default"
# Allow override of jail and delay osids. # Allow override of jail, delay, simnode osids.
variable jail_osname {} variable jail_osname {}
variable delay_osname {} variable delay_osname {}
variable sim_osname "FBSD-STD"
# Allow override of delay capacity. # Allow override of delay capacity.
variable delay_capacity {} variable delay_capacity {}
......
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group. # Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -339,11 +339,12 @@ Agent/TCP/FullTcp instproc connect {dst} { ...@@ -339,11 +339,12 @@ Agent/TCP/FullTcp instproc connect {dst} {
$self instvar application $self instvar application
$self instvar destination $self instvar destination
$self instvar role $self instvar role
var_import ::GLOBALS::sim_osname
$self set proto "tcp" $self set proto "tcp"
$dst set proto "tcp" $dst set proto "tcp"
$node set osid "FBSD-STD" $node set osid $sim_osname
$dst set osid "FBSD-STD" $dst set osid $sim_osname
} }
# Agent/Null # Agent/Null
......
Supports Markdown
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