Move snmpit and snmpit_new to snmpit_old/snmpit_old and snmpit_ancient.

configure

@@ -7339,6 +7339,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	backend/editgroup backend/newimageid_ez \
 	tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
 	tbsetup/snmpit_test/GNUmakefile  \
+	tbsetup/snmpit_old/GNUmakefile  \
 	tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
 	tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
 	tbsetup/power_mail.pm tbsetup/power_whol.pm \
@@ -7350,8 +7351,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/wanlinkinfo tbsetup/wanassign \
 	tbsetup/swapexp	tbsetup/endexp tbsetup/elabinelab \
 	tbsetup/eventsys.proxy \
-	tbsetup/snmpit.proxy tbsetup/snmpit_remote.pm \
-	tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
+	tbsetup/snmpit.proxy \
+	tbsetup/ns2ir/GNUmakefile \
 	tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
 	tbsetup/ns2ir/parse-ns tbsetup/ns2ir/parse.proxy \
 	tbsetup/ns2ir/sim.tcl tbsetup/nseswap tbsetup/nseparse/GNUmakefile \
@@ -7371,7 +7372,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         tbsetup/mkgroup tbsetup/eventsys_start \
 	tbsetup/eventsys_control \
 	tbsetup/mkproj tbsetup/libtestbed.pm \
-	tbsetup/portstats tbsetup/vnode_setup tbsetup/staticroutes \
+	tbsetup/vnode_setup tbsetup/staticroutes \
 	tbsetup/console_setup.proxy tbsetup/exports_setup.proxy \
 	tbsetup/smbpasswd_setup.proxy \
 	tbsetup/checkports tbsetup/libaudit.pm \
@@ -7415,6 +7416,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	utils/spewconlog utils/xlogin \
 	utils/opsdb_control utils/opsdb_control.proxy \
 	utils/remove_old_www utils/epmodeset \
+	utils/mkblob utils/rmblob \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3 www/xmlrpc.php3 \
 	www/xmlrpcpipe.php3 \
 	www/swish.conf www/websearch \

configure.in

@@ -1032,6 +1032,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	backend/editgroup backend/newimageid_ez \
 	tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
 	tbsetup/snmpit_test/GNUmakefile  \
+	tbsetup/snmpit_old/GNUmakefile  \
 	tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
 	tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
 	tbsetup/power_mail.pm tbsetup/power_whol.pm \
@@ -1043,8 +1044,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/wanlinkinfo tbsetup/wanassign \
 	tbsetup/swapexp	tbsetup/endexp tbsetup/elabinelab \
 	tbsetup/eventsys.proxy \
-	tbsetup/snmpit.proxy tbsetup/snmpit_remote.pm \
-	tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
+	tbsetup/snmpit.proxy \
+	tbsetup/ns2ir/GNUmakefile \
 	tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
 	tbsetup/ns2ir/parse-ns tbsetup/ns2ir/parse.proxy \
 	tbsetup/ns2ir/sim.tcl tbsetup/nseswap tbsetup/nseparse/GNUmakefile \
@@ -1064,7 +1065,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         tbsetup/mkgroup tbsetup/eventsys_start \
 	tbsetup/eventsys_control \
 	tbsetup/mkproj tbsetup/libtestbed.pm \
-	tbsetup/portstats tbsetup/vnode_setup tbsetup/staticroutes \
+	tbsetup/vnode_setup tbsetup/staticroutes \
 	tbsetup/console_setup.proxy tbsetup/exports_setup.proxy \
 	tbsetup/smbpasswd_setup.proxy \
 	tbsetup/checkports tbsetup/libaudit.pm \

tbsetup/GNUmakefile.in

@@ -17,15 +17,16 @@ SYSTEM         := $(shell uname -s)
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS		= checkpass ns2ir nseparse checkup template_cvsroot snmpit_test
+SUBDIRS		= checkpass ns2ir nseparse checkup template_cvsroot \
+		  snmpit_test snmpit_old
 ifeq ($(NSVERIFY),1)
 SUBDIRS		+= nsverify
 endif
 
-BIN_STUFF	= power snmpit snmpit_new tbend tbprerun tbreport \
+BIN_STUFF	= power tbend tbprerun tbreport \
 		  os_load endexp batchexp swapexp \
 		  node_reboot nscheck node_update savelogs node_control \
-		  portstats checkports eventsys_control os_select tbrestart \
+		  checkports eventsys_control os_select tbrestart \
 		  tbswap nseswap tarfiles_setup node_history tbrsync \
 		  pxe_select \
 		  archive_control template_create \
@@ -83,11 +84,9 @@ LIBEXEC_STUFF	= wanlinksolve wanlinkinfo os_setup mkexpdir console_setup \
 		  spewrpmtar webfrisbeekiller gentopofile \
                   $(WEB_BIN_SCRIPTS) $(WEB_SBIN_SCRIPTS)
 
-LIB_STUFF       = libtbsetup.pm exitonwarn.pm libtestbed.pm snmpit_intel.pm \
-                  snmpit_cisco.pm snmpit_lib.pm snmpit_apc.pm power_rpc27.pm \
-		  snmpit_cisco_stack.pm snmpit_intel_stack.pm power_sgmote.pm \
-		  snmpit_foundry.pm snmpit_stack.pm snmpit_remote.pm \
-		  snmpit_nortel.pm snmpit_hp.pm snmpit_apcon.pm\
+LIB_STUFF       = libtbsetup.pm exitonwarn.pm libtestbed.pm \
+                  power_rpc27.pm \
+		  power_sgmote.pm \
 		  libaudit.pm libreboot.pm libosload.pm libtestbed.py \
 		  libadminmfs.pm libtblog.pm libtblog_simple.pm libArchive.pm \
 		  power_mail.pm power_whol.pm Template.pm power_rmcp.pm \
@@ -155,6 +154,9 @@ ns2ir:
 snmpit_test:
 	@$(MAKE) -C snmpit_test all
 
+snmpit_old:
+	@$(MAKE) -C snmpit_old all
+
 nsverify:
 	@$(MAKE) -C nsverify all
 
@@ -210,6 +212,7 @@ ifeq ($(IPASSIGN),Yes)
 endif
 	@$(MAKE) -C checkup install
 	@$(MAKE) -C snmpit_test install
+	@$(MAKE) -C snmpit_old install
 
 script-install:	$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
 	 $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
@@ -320,6 +323,7 @@ subdir-clean:
 	@$(MAKE) -C ipassign clean
 	@$(MAKE) -C checkup clean
 	@$(MAKE) -C snmpit_test clean
+	@$(MAKE) -C snmpit_old clean
 
 distclean:	subdir-distclean
 
@@ -332,6 +336,7 @@ subdir-distclean:
 	@$(MAKE) -C ipassign distclean
 	@$(MAKE) -C checkup distclean
 	@$(MAKE) -C snmpit_test distclean
+	@$(MAKE) -C snmpit_old distclean
 #
 # XXX Create non .tcl files.
 #

tbsetup/snmpit_old/GNUmakefile.in

+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= ../..
+SUBDIR		= tbsetup/snmpit_old
+ISMAINSITE	= @TBMAINSITE@
+SYSTEM         := $(shell uname -s)
+
+include $(OBJDIR)/Makeconf
+
+SUBDIRS		= 
+
+BIN_STUFF	= snmpit_old snmpit_ancient 
+LIB_STUFF       = snmpit_intel.pm \
+                  snmpit_cisco.pm snmpit_lib.pm snmpit_apc.pm \
+		  snmpit_cisco_stack.pm snmpit_intel_stack.pm \
+		  snmpit_foundry.pm snmpit_stack.pm snmpit_remote.pm \
+		  snmpit_nortel.pm snmpit_hp.pm snmpit_apcon.pm
+
+#
+# Force dependencies on the scripts so that they will be rerun through
+# configure if the .in file is changed.
+# 
+all:	$(LIB_STUFF) $(BIN_STUFF)
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+install: all script-install
+
+script-install:	 $(addprefix $(INSTALL_LIBDIR)/snmpit_old/, $(LIB_STUFF)) \
+		$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF))
+
+control-install:
+
+fs-install:
+
+tipserv-install:
+
+clrhouse-install:
+
+clean:	
+
+$(INSTALL_DIR)/lib/snmpit_old/%: %
+	@echo "Installing $<"
+	-mkdir -p $(INSTALL_DIR)/lib/snmpit_old
+	$(INSTALL) $< $@

tbsetup/snmpit.in → tbsetup/snmpit_old/snmpit_ancient.in

 #!/usr/bin/perl -w
 #
 # EMULAB-LGPL
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -23,8 +23,6 @@ my $TB = '@prefix@';
 use libdb;
 use User;
 use Experiment;
-use snmpit_lib;
-use snmpit_remote;
 use libtblog;
 use EmulabFeatures;
 
@@ -32,6 +30,11 @@ use English;
 use Getopt::Long;
 use strict;
 
+# Optional alternate version of libraries.
+use lib '@prefix@/lib/snmpit_old';
+use snmpit_lib;
+use snmpit_remote;
+
 # Protos
 sub parseStatusString($);
 sub debug($);
@@ -473,37 +476,6 @@ if ($pid && $eid) {
 	die "You do not have permission to modify experiment $pid/$eid\n";
     }
 }
-#
-# See if we use the alternate version of snmpit from Rob.
-#
-if ($TB eq "/usr/testbed" && !$opt{Z}) {
-    my $group = (defined($experiment) ? $experiment->GetGroup() : undef);
-    $EmulabFeatures::verbose = 0;
-    my $testsnmpit =
-        (EmulabFeatures->FeatureEnabled("TestSnmpit",
-					$this_user, $group, $experiment));
-    if ($testsnmpit) {
-	my $newpath = "$TB/bin/snmpit_test";
-	print STDERR "Invoking alternate snmpit from $newpath\n";
-	
-        unshift(@SAVEARGV, "-Z");
-	exec $newpath, @SAVEARGV;
-	die("*** $0:\n".
-	    "    Could not exec $newpath: $!");
-    }
-    my $newsnmpit =
-        (EmulabFeatures->FeatureEnabled("NewSnmpit",
-					$this_user, $group, $experiment));
-    if ($newsnmpit) {
-	my $newpath = "$TB/bin/snmpit_new";
-	print STDERR "Invoking alternate snmpit from $newpath\n";
-	
-        unshift(@SAVEARGV, "-Z");
-	exec $newpath, @SAVEARGV;
-	die("*** $0:\n".
-	    "    Could not exec $newpath: $!");
-    }
-}
 
 if (!@commands) {
     tbreport(SEV_ERROR, 'no_operation');

tbsetup/snmpit_new.in → tbsetup/snmpit_old/snmpit_old.in

 #!/usr/bin/perl -w
 #
 # EMULAB-LGPL
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -30,7 +30,7 @@ use Getopt::Long;
 use strict;
 
 # Optional alternate version of libraries.
-#use lib '@prefix@/lib/snmpit_test';
+use lib '@prefix@/lib/snmpit_old';
 use snmpit_lib;
 use snmpit_remote;
 
@@ -495,26 +495,6 @@ if ($pid && $eid) {
 	die "You do not have permission to modify experiment $pid/$eid\n";
     }
 }
-#
-# See if we use the alternate version of snmpit from Rob.
-#
-if ($MAINSITE && $TB eq "/usr/testbed" && !$opt{Z}) {
-    my $group = (defined($experiment) ? $experiment->GetGroup() : undef);
-    $EmulabFeatures::verbose = 0;
-    my $newsnmpit =
-        (EmulabFeatures->FeatureEnabled("RobSnmpit",
-					$this_user, $group, $experiment));
-    if ($newsnmpit) {
-	# Rob, change this path:
-	my $newpath = "$TB/bin/snmpit";
-	print STDERR "Invoking alternate snmpit from $newpath\n";
-	
-        unshift(@SAVEARGV, "-Z");
-	exec $newpath, @SAVEARGV;
-	die("*** $0:\n".
-	    "    Could not exec $newpath: $!");
-    }
-}
 
 if (!@commands) {
     tbreport(SEV_ERROR, 'no_operation');