Featureize libvtop so that we can test alternate version with fixes

for LM.

tbsetup/GNUmakefile.in

@@ -88,7 +88,9 @@ LIB_STUFF       = libtbsetup.pm exitonwarn.pm libtestbed.pm snmpit_intel.pm \
 		  power_mail.pm power_whol.pm Template.pm power_rmcp.pm \
 		  power_ilo.pm libvtop.pm libptop.pm libossetup.pm \
 		  power_ipmi.pm libosload_new.pm libosload_switch.pm \
-		  libossetup_switch.pm power_icebox.pm
+		  libossetup_switch.pm power_icebox.pm \
+		  libvtop_stable.pm libvtop_test.pm
+
 
 # These scripts installed setuid, with sudo. 
 SETUID_BIN_SCRIPTS   = node_reboot eventsys_control tarfiles_setup savelogs \

tbsetup/libvtop.pm.in → tbsetup/libvtop_stable.pm.in

@@ -4,7 +4,7 @@
 # Copyright (c) 2005-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-package libvtop;
+package libvtop_stable;
 
 use strict;
 use Exporter;
@@ -705,7 +705,7 @@ sub doesimplement($$)
 #############################################################################
 # Back to the main package.
 #
-package libvtop;
+package libvtop_stable;
 
 #
 # Load some physical info (for types, interfaces, speeds).

tbsetup/mapper.in

 #!/usr/bin/perl -w
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2010 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use strict;
@@ -226,6 +226,8 @@ my $newassign =
     EmulabFeatures->FeatureEnabled("NewAssign",
 				   $this_user,
 				   $experiment->GetGroup(), $experiment);
+
+libvtop::Init($this_user, $experiment->GetGroup(), $experiment);
     
 #
 # These are the flags to the vtop creation code.