Commit 898997c0 authored by Leigh B Stoller's avatar Leigh B Stoller

I guess we are done testing snmpit_test! It is now the one

true *snmpit*, all others are imposters and have been shot.

The snmpit_test directory moved to snmpit. snmpit_old is gone.
parent 87eed168
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Generated by GNU Autoconf 2.69. # Generated by GNU Autoconf 2.69.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012, 2016 Free Software Foundation, Inc.
# #
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
...@@ -6873,6 +6873,18 @@ else ...@@ -6873,6 +6873,18 @@ else
PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc" PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc"
fi fi
#
# Check to see if snmpit is a plain file, delete it if so. It is now
# a directory. This only matters when reconfiguring an existing tree.
#
if test -f "tbsetup/snmpit"; then
echo "Removing old snmpit file, now a directory";
/bin/rm -f tbsetup/snmpit
if test $? -ne 0; then
as_fn_error $? "Cannot remove old tbsetup/snmpit file" "$LINENO" 5;
fi
fi
# #
# Determine the timezone (stupidity in PHP5, see apache/php.ini) # Determine the timezone (stupidity in PHP5, see apache/php.ini)
# #
...@@ -6951,8 +6963,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -6951,8 +6963,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
backend/editnodetype backend/editsitevars backend/newimageid \ backend/editnodetype backend/editsitevars backend/newimageid \
backend/editgroup backend/newimageid_ez \ backend/editgroup backend/newimageid_ez \
tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \ tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
tbsetup/snmpit_test/GNUmakefile \ tbsetup/snmpit/GNUmakefile \
tbsetup/snmpit_old/GNUmakefile \
tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \ tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \ tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/power_mail.pm tbsetup/power_whol.pm \ tbsetup/power_mail.pm tbsetup/power_whol.pm \
......
...@@ -1209,6 +1209,18 @@ else ...@@ -1209,6 +1209,18 @@ else
PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc" PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc"
fi fi
#
# Check to see if snmpit is a plain file, delete it if so. It is now
# a directory. This only matters when reconfiguring an existing tree.
#
if test -f "tbsetup/snmpit"; then
echo "Removing old snmpit file, now a directory";
/bin/rm -f tbsetup/snmpit
if test $? -ne 0; then
AC_MSG_ERROR([Cannot remove old tbsetup/snmpit file]);
fi
fi
# #
# Determine the timezone (stupidity in PHP5, see apache/php.ini) # Determine the timezone (stupidity in PHP5, see apache/php.ini)
# #
...@@ -1285,8 +1297,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1285,8 +1297,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
backend/editnodetype backend/editsitevars backend/newimageid \ backend/editnodetype backend/editsitevars backend/newimageid \
backend/editgroup backend/newimageid_ez \ backend/editgroup backend/newimageid_ez \
tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \ tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
tbsetup/snmpit_test/GNUmakefile \ tbsetup/snmpit/GNUmakefile \
tbsetup/snmpit_old/GNUmakefile \
tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \ tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \ tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/power_mail.pm tbsetup/power_whol.pm \ tbsetup/power_mail.pm tbsetup/power_whol.pm \
......
...@@ -5769,7 +5769,7 @@ sub SyncPortLans($) ...@@ -5769,7 +5769,7 @@ sub SyncPortLans($)
} }
print "Syncing target vlan $idx in $experiment\n"; print "Syncing target vlan $idx in $experiment\n";
mysystem("$TB/bin/snmpit_test -f --redirect-err -X $pid $eid $idx"); mysystem("$TB/bin/snmpit -f --redirect-err -X $pid $eid $idx");
if ($?) { if ($?) {
$portvlan->Unlock(); $portvlan->Unlock();
return -1; return -1;
...@@ -6012,7 +6012,7 @@ sub ClearPortLans($;$@) ...@@ -6012,7 +6012,7 @@ sub ClearPortLans($;$@)
my $lanid = $portvlan->lanid(); my $lanid = $portvlan->lanid();
print "Syncing target vlan $lanid in $experiment\n"; print "Syncing target vlan $lanid in $experiment\n";
mysystem("$TB/bin/snmpit_test -f --redirect-err -X $pid $eid $lanid"); mysystem("$TB/bin/snmpit -f --redirect-err -X $pid $eid $lanid");
if ($?) { if ($?) {
$portvlan->Unlock() $portvlan->Unlock()
if (!$nolock); if (!$nolock);
......
...@@ -456,7 +456,7 @@ Setting up an InstaGeni Rack. First, we need the following info: ...@@ -456,7 +456,7 @@ Setting up an InstaGeni Rack. First, we need the following info:
Now create and share the openflow vlan: Now create and share the openflow vlan:
boss> wap snmpit_test --vlan_tag=1750 -m mesoscale-openflow \ boss> wap snmpit --vlan_tag=1750 -m mesoscale-openflow \
emulab-ops openflow-vlans interconnect-geni-core:eth0 emulab-ops openflow-vlans interconnect-geni-core:eth0
boss> wap sharevlan -f -o emulab-ops,openflow-vlans \ boss> wap sharevlan -f -o emulab-ops,openflow-vlans \
mesoscale-openflow mesoscale-openflow mesoscale-openflow mesoscale-openflow
......
...@@ -82,7 +82,7 @@ my $EVENTSYS = "$TB/bin/eventsys_control"; ...@@ -82,7 +82,7 @@ my $EVENTSYS = "$TB/bin/eventsys_control";
my $VNODESETUP = "$TB/sbin/vnode_setup"; my $VNODESETUP = "$TB/sbin/vnode_setup";
my $POWER = "$TB/bin/power"; my $POWER = "$TB/bin/power";
my $OSLOAD = "$TB/bin/os_load"; my $OSLOAD = "$TB/bin/os_load";
my $SNMPIT = "$TB/bin/snmpit_test"; my $SNMPIT = "$TB/bin/snmpit";
my $NAMEDSETUP = "$TB/sbin/named_setup"; my $NAMEDSETUP = "$TB/sbin/named_setup";
my $EXPORTS_SETUP = "$TB/sbin/exports_setup"; my $EXPORTS_SETUP = "$TB/sbin/exports_setup";
my $GENTOPOFILE = "$TB/libexec/gentopofile"; my $GENTOPOFILE = "$TB/libexec/gentopofile";
......
...@@ -109,7 +109,7 @@ my $IPASSIGN = "$TB/libexec/ipassign_wrapper"; ...@@ -109,7 +109,7 @@ my $IPASSIGN = "$TB/libexec/ipassign_wrapper";
my $TARFILES_SETUP = "$TB/bin/tarfiles_setup"; my $TARFILES_SETUP = "$TB/bin/tarfiles_setup";
my $MAPPER = "$TB/bin/mapper"; my $MAPPER = "$TB/bin/mapper";
my $VTOPGEN = "$TB/bin/vtopgen"; my $VTOPGEN = "$TB/bin/vtopgen";
my $SNMPIT = "$TB/bin/snmpit_test"; my $SNMPIT = "$TB/bin/snmpit";
my $RESERVEVLANS = "$TB/sbin/protogeni/reservevlans"; my $RESERVEVLANS = "$TB/sbin/protogeni/reservevlans";
my $NEWGROUP = "$TB/bin/newgroup"; my $NEWGROUP = "$TB/bin/newgroup";
my $NEWPROJECT = "$TB/sbin/newproj"; my $NEWPROJECT = "$TB/sbin/newproj";
......
# #
# Copyright (c) 2000-2015 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -35,17 +35,17 @@ SYSTEM := $(shell uname -s) ...@@ -35,17 +35,17 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = checkpass ns2ir nseparse checkup template_cvsroot \ SUBDIRS = checkpass ns2ir nseparse checkup template_cvsroot \
snmpit_test snmpit_old snmpit
ifeq ($(NSVERIFY),1) ifeq ($(NSVERIFY),1)
SUBDIRS += nsverify SUBDIRS += nsverify
endif endif
BIN_STUFF = power snmpit tbend tbprerun tbreport \ BIN_STUFF = power tbend tbprerun tbreport \
os_load endexp batchexp swapexp \ os_load endexp batchexp swapexp \
node_reboot nscheck node_update savelogs node_control \ node_reboot nscheck node_update savelogs node_control \
checkports eventsys_control os_select tbrestart \ checkports eventsys_control os_select tbrestart \
tbswap nseswap tarfiles_setup node_history tbrsync \ tbswap nseswap tarfiles_setup node_history tbrsync \
pxe_select portstats \ pxe_select \
archive_control template_create \ archive_control template_create \
template_swapin template_swapout template_graph \ template_swapin template_swapout template_graph \
template_exprun template_delete template_metadata \ template_exprun template_delete template_metadata \
...@@ -172,11 +172,8 @@ checkpass: ...@@ -172,11 +172,8 @@ checkpass:
ns2ir: ns2ir:
@$(MAKE) -C ns2ir all @$(MAKE) -C ns2ir all
snmpit_test: snmpit:
@$(MAKE) -C snmpit_test all @$(MAKE) -C snmpit all
snmpit_old:
@$(MAKE) -C snmpit_old all
nsverify: nsverify:
@$(MAKE) -C nsverify all @$(MAKE) -C nsverify all
...@@ -232,8 +229,7 @@ ifeq ($(IPASSIGN),Yes) ...@@ -232,8 +229,7 @@ ifeq ($(IPASSIGN),Yes)
@$(MAKE) -C ipassign install @$(MAKE) -C ipassign install
endif endif
@$(MAKE) -C checkup install @$(MAKE) -C checkup install
@$(MAKE) -C snmpit_test install @$(MAKE) -C snmpit install
@$(MAKE) -C snmpit_old install
script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \ script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \ $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
...@@ -344,8 +340,7 @@ subdir-clean: ...@@ -344,8 +340,7 @@ subdir-clean:
@$(MAKE) -C plab clean @$(MAKE) -C plab clean
@$(MAKE) -C ipassign clean @$(MAKE) -C ipassign clean
@$(MAKE) -C checkup clean @$(MAKE) -C checkup clean
@$(MAKE) -C snmpit_test clean @$(MAKE) -C snmpit clean
@$(MAKE) -C snmpit_old clean
distclean: subdir-distclean distclean: subdir-distclean
...@@ -357,8 +352,7 @@ subdir-distclean: ...@@ -357,8 +352,7 @@ subdir-distclean:
@$(MAKE) -C plab distclean @$(MAKE) -C plab distclean
@$(MAKE) -C ipassign distclean @$(MAKE) -C ipassign distclean
@$(MAKE) -C checkup distclean @$(MAKE) -C checkup distclean
@$(MAKE) -C snmpit_test distclean @$(MAKE) -C snmpit distclean
@$(MAKE) -C snmpit_old distclean
# #
# XXX Create non .tcl files. # XXX Create non .tcl files.
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -66,7 +66,7 @@ use Experiment; ...@@ -66,7 +66,7 @@ use Experiment;
use User; use User;
# Optional alternate version of libraries. # Optional alternate version of libraries.
use lib '@prefix@/lib/snmpit_test'; use lib '@prefix@/lib/snmpit';
use snmpit_lib; use snmpit_lib;
# The set of OIDs we care about # The set of OIDs we care about
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LGPL
#
# 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 Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 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 Lesser General Public
# License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
# This now a frontend to run the proper version.
#
use English;
use Getopt::Long;
use strict;
#
# Configure variables
#
my $TB = '@prefix@';
# This is all we need for a front end.
use lib '@prefix@/lib';
use User;
use libtestbed;
use EmulabFeatures;
#
# See if we use the alternate version of snmpit.
#
my $this_user;
if ($UID) {
$this_user = User->ThisUser();
if (! defined($this_user)) {
die("*** $0:\n".
" You ($UID) do not exist!\n");
}
}
# Lets not bother (or worry) people.
$EmulabFeatures::verbose = 0;
if (EmulabFeatures->FeatureEnabled("OldSnmpit", $this_user, undef, undef)) {
my $newpath = "$TB/lib/snmpit_old/portstats";
print STDERR "Invoking alternate portstats from $newpath\n";
exec $newpath, @ARGV;
die("*** $0:\n".
" Could not exec $newpath: $!");
}
my $newpath = "$TB/lib/snmpit_test/portstats";
exec $newpath, @ARGV;
die("*** $0:\n".
" Could not exec $newpath: $!");
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LGPL
#
# 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 Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 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 Lesser General Public
# License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
# This now a frontend to run the proper version.
#
use English;
use Getopt::Long;
use strict;
#
# Configure variables
#
my $TB = '@prefix@';
# This is all we need for a front end.
use lib '@prefix@/lib';
use User;
use libtestbed;
use EmulabFeatures;
#
# See if we use the alternate version of snmpit.
#
my $this_user;
if ($UID) {
$this_user = User->ThisUser();
if (! defined($this_user)) {
die("*** $0:\n".
" You ($UID) do not exist!\n");
}
}
# Lets not bother (or worry) people.
$EmulabFeatures::verbose = 0;
if (EmulabFeatures->FeatureEnabled("OldSnmpit", $this_user, undef, undef)) {
my $newpath = "$TB/bin/snmpit_old";
print STDERR "Invoking alternate snmpit from $newpath\n";
exec $newpath, @ARGV;
die("*** $0:\n".
" Could not exec $newpath: $!");
}
my $newpath = "$TB/bin/snmpit_test";
exec $newpath, @ARGV;
die("*** $0:\n".
" Could not exec $newpath: $!");
# #
# Copyright (c) 2000-2013 University of Utah and the Flux Group. # Copyright (c) 2000-2013, 2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../.. OBJDIR = ../..
SUBDIR = tbsetup/snmpit_test SUBDIR = tbsetup/snmpit
ISMAINSITE = @TBMAINSITE@ ISMAINSITE = @TBMAINSITE@
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
...@@ -32,8 +32,8 @@ include $(OBJDIR)/Makeconf ...@@ -32,8 +32,8 @@ include $(OBJDIR)/Makeconf
SUBDIRS = SUBDIRS =
BIN_STUFF = snmpit_test BIN_STUFF = snmpit portstats
LIB_STUFF = portstats snmpit_intel.pm \ LIB_STUFF = snmpit_intel.pm \
snmpit_cisco.pm snmpit_lib.pm \ snmpit_cisco.pm snmpit_lib.pm \
snmpit_cisco_stack.pm snmpit_intel_stack.pm \ snmpit_cisco_stack.pm snmpit_intel_stack.pm \
snmpit_foundry.pm snmpit_stack.pm snmpit_remote.pm \ snmpit_foundry.pm snmpit_stack.pm snmpit_remote.pm \
...@@ -53,8 +53,9 @@ include $(TESTBED_SRCDIR)/GNUmakerules ...@@ -53,8 +53,9 @@ include $(TESTBED_SRCDIR)/GNUmakerules
install: all script-install install: all script-install
script-install: $(addprefix $(INSTALL_LIBDIR)/snmpit_test/, $(LIB_STUFF)) \ script-install: \
$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) $(addprefix $(INSTALL_LIBDIR)/snmpit/, $(LIB_STUFF)) \
$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF))
control-install: control-install:
...@@ -66,14 +67,10 @@ clrhouse-install: ...@@ -66,14 +67,10 @@ clrhouse-install:
clean: clean:
rm -f snmpit_arista_switch_daemon.py snmpit_remote.pm \ rm -f snmpit_arista_switch_daemon.py snmpit_remote.pm \
snmpit_test portstats snmpit_arista.pm snmpit portstats snmpit_arista.pm
$(INSTALL_DIR)/lib/snmpit_test/%: % $(INSTALL_LIBDIR)/snmpit/%: %
@echo "Installing $<" @echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/lib/snmpit_test -mkdir -p $(INSTALL_LIBDIR)/snmpit
$(INSTALL) $< $@ $(INSTALL) $< $@
$(INSTALL_DIR)/lib/snmpit_test/portstats: portstats
@echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/lib/snmpit_test
$(INSTALL_PROGRAM) $< $@
#!/usr/bin/perl #!/usr/bin/perl
# #
# Copyright (c) 2000-2014 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -49,7 +49,7 @@ use libtblog; ...@@ -49,7 +49,7 @@ use libtblog;
use Port; use Port;
# Optional alternate version of libraries. # Optional alternate version of libraries.
use lib '@prefix@/lib/snmpit_test'; use lib '@prefix@/lib/snmpit';
use snmpit_lib; use snmpit_lib;
use English; use English;
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2000-2015 University of Utah and the Flux Group. # Copyright (c) 2000-2016 University of Utah and the Flux Group.
# #
# {{{EMULAB-LGPL # {{{EMULAB-LGPL
# #
...@@ -50,7 +50,7 @@ use strict; ...@@ -50,7 +50,7 @@ use strict;
use List::Util qw(shuffle); use List::Util qw(shuffle);
# Optional alternate version of libraries. # Optional alternate version of libraries.
use lib '@prefix@/lib/snmpit_test'; use lib '@prefix@/lib/snmpit';
use snmpit_lib; use snmpit_lib;
use snmpit_remote; use snmpit_remote;
......
#
# Copyright (c) 2000-2012 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/>.
#
# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = tbsetup/snmpit_old
ISMAINSITE = @TBMAINSITE@