It is Cleanup Friday!

Get rid of ELVIN_COMPAT and CONFIG_OPSVM from elabinelab land.
These options still exist throughout the install code, didn't touch that.

tbsetup/elabinelab.in

@@ -697,25 +697,6 @@ sub DumpDBGoo()
 	"    Could not get elabinelab attributes\n")
 	if (!defined($attributes));
 
-    if (exists($attributes->{'CONFIG_OPSVM'}) && $attributes->{'CONFIG_OPSVM'}){
-	#
-	# Need to assign an IP to the ops node for the jail.
-	#
-	my $pnode = Node->Lookup($bossnode);
-	die("*** $0:\n".
-	    "    Could not lookup $bossnode\n")
-	    if (!defined($pnode));
-	my ($ip,$ipmask) = $pnode->GetJailIP();
-	die("*** $0:\n".
-	    "    Could not generate an IP for OPS jail\n")
-	    if (!defined($ip));
-	
-	print "Setting the IP for OPS jail to $ip\n";
-	$experiment->SetElabInElabAttr("boss", "OPSIP", $ip);
-	$experiment->SetElabInElabAttr("ops",  "OPSIP", $ip);
-	$experiment->SetElabInElabAttr("fs",   "OPSIP", $ip);
-    }
-
     #
     # These tables are dumped completely.
     #

tbsetup/ns2ir/GNUmakefile.in

 #
-# Copyright (c) 2000-2012 University of Utah and the Flux Group.
+# Copyright (c) 2000-2017 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -34,7 +34,7 @@ include $(OBJDIR)/Makeconf
 LIB_STUFF    = lanlink.tcl node.tcl sim.tcl tb_compat.tcl null.tcl \
 		nsobject.tcl traffic.tcl vtype.tcl parse.tcl program.tcl \
 		nsenode.tcl nstb_compat.tcl event.tcl firewall.tcl \
-		elabinelab.ns elabinelab-withfsnode.ns elabinelab-opsvm.ns \
+		elabinelab.ns elabinelab-withfsnode.ns \
 		fw.ns timeline.tcl sequence.tcl \
 		topography.tcl console.tcl path.tcl \
 		disk.tcl custom.tcl elabinelab-xen.ns \

tbsetup/ns2ir/elabinelab-opsvm.ns

-#
-# Copyright (c) 2004-2017 University of Utah and the Flux Group.
-# 
-# {{{EMULAB-LICENSE
-# 
-# This file is part of the Emulab network testbed software.
-# 
-# This file is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-# 
-# This file is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
-# License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# }}}
-#
-
-#
-# This file is intended to be included into another NS file. It is not
-# a stand alone file.
-# 
-set myboss [$ns node]
-
-set srvtype  pc
-set nodetype pcslow
-
-tb-set-node-inner-elab-role $myboss boss+fs+router
-tb-set-elabinelab-attribute CONFIG_OPSVM 1
-tb-set-elabinelab-attribute OPSNODE myops
-
-if {[info exists ::TBCOMPAT::elabinelab_hardware("boss")]} {
-    namespace eval TBCOMPAT {
-        tb-set-hardware $myboss $elabinelab_hardware("boss")
-    }
-} else {
-    tb-set-hardware $myboss $srvtype
-}
-
-if {[info exists ::TBCOMPAT::elabinelab_fixnodes("boss")]} {
-    namespace eval TBCOMPAT {
-        tb-fix-node $myboss $elabinelab_fixnodes("boss")
-    }
-}
-
-# Deal with tarfiles
-set myboss_tarfiles ""
-
-if {${::TBCOMPAT::elabinelab_source_tarfile} != ""} {
-    append myboss_tarfiles "/usr/src ${::TBCOMPAT::elabinelab_source_tarfile}"
-}
-
-if {[info exists ::TBCOMPAT::elabinelab_tarfiles("boss")]} {
-    if {$myboss_tarfiles != ""} {
-	append myboss_tarfiles " "
-    }
-    namespace eval TBCOMPAT {
-	append myboss_tarfiles $elabinelab_tarfiles("boss")
-    }
-}
-if {$myboss_tarfiles != ""} {
-    tb-set-node-tarfiles $myboss $myboss_tarfiles
-}
-
-#
-# This is passed in by the parser, when wrapping an existing experiment.
-# The parser wrapper gets info about the wrapped experiment and passes it
-# along in the TBCOMPAT namespace.
-#
-if { ${::TBCOMPAT::elabinelab_maxpcs} != 0 } {
-    set maxpcs ${::TBCOMPAT::elabinelab_maxpcs}
-} else {
-    set maxpcs 0
-}
-
-set lanstr "myboss "
-for {set i 1} {$i <= $maxpcs} {incr i} {
-	set name "mypc${i}"
-	set $name [$ns node]
-	append lanstr "[set $name] "
-	tb-set-node-inner-elab-role [set $name] node
-
-	if {[info exists ::TBCOMPAT::elabinelab_nodeos($name)]} {
-	    namespace eval TBCOMPAT {
-        	tb-set-node-os [set $name] $elabinelab_nodeos($name)
-	    }
-	}
-
-	if {[info exists ::TBCOMPAT::elabinelab_fixnodes($name)]} {
-	    namespace eval TBCOMPAT {
-        	tb-fix-node [set $name] $elabinelab_fixnodes($name)
-	    }
-        } elseif {[info exists ::TBCOMPAT::elabinelab_hardware($name)]} {
-	    namespace eval TBCOMPAT {
-		tb-set-hardware [set $name] $elabinelab_hardware($name)
-	    }
-	} else {
-	    tb-set-hardware [set $name] $nodetype
-	}
-}
-
-if { ${::GLOBALS::elabinelab_singlenet} == 0 } {
-    if { ${::TBCOMPAT::elabinelab_cnetspeed} != 0 } {
-	set _cnetspeed ${::TBCOMPAT::elabinelab_cnetspeed}
-    } else {
-	set _cnetspeed 100
-    }
-    set publiclan [$ns make-lan $lanstr ${_cnetspeed}Mb 0ms]
-
-    tb-set-ip-lan $myboss $publiclan 10.200.1.252
-    for {set i 1} {$i <= $maxpcs} {incr i} {
-	set name "mypc${i}"
-	tb-set-ip-lan [set $name] $publiclan 10.200.1.$i
-    }
-}
-
-if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
-    namespace eval TBCOMPAT {
-        tb-set-node-os $myboss $elabinelab_nodeos("boss")
-    }
-} elseif {[info exists ::TBCOMPAT::sitevariables(elabinelab/boss_osid)]} {
-    namespace eval TBCOMPAT {
-	tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
-    }
-} else {
-    tb-set-node-os $myboss FBSD83-STD
-}
-tb-set-node-loadlist $myboss FBSD83-S2