All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 2f84d39e authored by Kirk Webb's avatar Kirk Webb

Merge remote-tracking branch 'central/master' into win7devel

parents 4b0232e1 b7b18b03
......@@ -90,8 +90,10 @@ frisbee-mfs:
frisbee-mfs-install:
ifeq ($(SYSTEM),FreeBSD)
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C growdisk client-install
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux client-install
else
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C growdisk client-install
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux client-install
endif
mfs-install:
......
......@@ -130,6 +130,7 @@ if (! -d $mountpoint) {
#
if (defined($diskopt)) {
$disk = $diskopt;
$disk =~ s/^\/dev\///;
}
else {
my $rootdev = `df | egrep '/\$'`;
......
......@@ -843,6 +843,8 @@ OPSVM_MOUNTPOINT
PORTAL_ENABLE
PORTAL_ISPRIMARY
LINUX_FSNODE
VPUBADDR_BASE
VPUBADDR_BITLEN
TBOPSEMAIL
TBOPSEMAIL_NOSLASH
TBROBOCOPSEMAIL
......@@ -867,6 +869,7 @@ TBUSERSARCHIVE
TBUSERSARCHIVE_NOSLASH
TBERRORSEMAIL
TBERRORSEMAIL_NOSLASH
ARISTA_SWITCH_XMLRPCPORT
WITH_EMULAB
LOG_TESTBED
LEDA
......@@ -4981,6 +4984,8 @@ done
......@@ -5011,6 +5016,11 @@ done
#
# For snmpit support of Arista switch.
#
#
......@@ -5093,6 +5103,9 @@ PORTAL_ENABLE=0
PORTAL_ISPRIMARY=0
LINUX_FSNODE=0
DHCPD_EXTRAIFS=""
VPUBADDR_BASE="none"
VPUBADDR_BITLEN="none"
ARISTA_SWITCH_XMLRPCPORT=80
#
# XXX You really don't want to change these!
......
......@@ -273,6 +273,11 @@ AC_SUBST(TBUSERSARCHIVE_NOSLASH)
AC_SUBST(TBERRORSEMAIL)
AC_SUBST(TBERRORSEMAIL_NOSLASH)
#
# For snmpit support of Arista switch.
#
AC_SUBST(ARISTA_SWITCH_XMLRPCPORT)
#
# Defaults for for above variables.
#
......@@ -355,6 +360,7 @@ LINUX_FSNODE=0
DHCPD_EXTRAIFS=""
VPUBADDR_BASE="none"
VPUBADDR_BITLEN="none"
ARISTA_SWITCH_XMLRPCPORT=80
#
# XXX You really don't want to change these!
......
......@@ -12,3 +12,4 @@ TBSTATEDEMAIL=wbsun@cs.utah.edu
TBTESTSUITEEMAIL=wbsun@cs.utah.edu
WWW=www.emulab.net/dev/wbsun
THISHOMEBASE=Wbsun.Emulab.Net
ARISTA_SWITCH_XMLRPCPORT=80
......@@ -20,7 +20,8 @@ LIB_STUFF = snmpit_intel.pm \
snmpit_cisco.pm snmpit_lib.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
snmpit_nortel.pm snmpit_hp.pm snmpit_apcon.pm \
snmpit_arista.pm snmpit_arista_switch_daemon.py
#
# Force dependencies on the scripts so that they will be rerun through
......
This diff is collapsed.
This diff is collapsed.
......@@ -385,6 +385,10 @@ sub getExperimentTrunks($$@) {
# shared lan are sometimes shared nodes! Confused yet?
#
foreach my $vlanid (@vlans) {
# Allow vlan list to be vlan objects.
$vlanid = $vlanid->id()
if (ref($vlanid));
foreach my $port (getVlanPorts($vlanid)) {
next
if (!$port->trunk());
......@@ -452,6 +456,10 @@ sub getExperimentCurrentTrunks($$@) {
# shared lan are sometimes shared nodes! Confused yet?
#
foreach my $vlanid (@vlans) {
# Allow vlan list to be vlan objects.
$vlanid = $vlanid->id()
if (ref($vlanid));
my @vlanports = getExperimentVlanPorts($vlanid);
foreach my $port (@vlanports) {
......
......@@ -1594,6 +1594,12 @@ sub snap($) {
$device = new snmpit_apcon($devicename,$self->{DEBUG});
last;
}; # /apcon.*/
(/arista/)
&& do {
require snmpit_arista;
$device = new snmpit_arista($devicename, $self->{DEBUG});
last;
}; # /arista.*/
print "Device $devicename is not of a known type\n";
}
if (!$device) {
......
<!--
EMULAB-COPYRIGHT
Copyright (c) 2005-2010 University of Utah and the Flux Group.
Copyright (c) 2005-2012 University of Utah and the Flux Group.
All rights reserved.
-->
<center>
......@@ -62,5 +62,8 @@
<tr>
<td>pc521 - pc560</td><td>procurve3-5</td><td>5 x 1Gb</td>
</tr>
<tr>
<td>pc601 - pc616</td><td>arista1</td><td>3 x 10Gb</td>
</tr>
</table>
</center>
www/doc/topo.jpg

65.9 KB | W: | H:

www/doc/topo.jpg

134 KB | W: | H:

www/doc/topo.jpg
www/doc/topo.jpg
www/doc/topo.jpg
www/doc/topo.jpg
  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
No preview for this file type
Markdown is supported
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