Commit 793d44d7 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 61f0edd1 efd64bad
......@@ -449,13 +449,6 @@ sub SetAggregate($$)
" aggregate_idx='$agg_idx' ".
"where idx='$idx'"));
if (!DBQueryWarn("update aggregate_history set ".
" aggregate_uuid='$agg_uuid' ".
"where idx='$idx'")) {
print STDERR "GeniAggregate::SetAggregate: ".
"Failed to update aggregate_history for $self\n";
}
$self->{'AGGREGATE'}->{'aggregate_idx'} = $agg_idx;
$self->{'PARENT'} = $aggregate;
return 0;
......@@ -910,7 +903,10 @@ sub Start($$$)
# reboot the physnode since we might only be adding a new node
# in which case, a full reboot is wrong.
#
if (! $node->IsUp()) {
if (! $node->IsUp() ||
# This catches the pg nodes which are in ISUP while free.
($sliver->status() eq "created" && !defined($vnode))) {
# We should be using allocstatus.
if ($sliver->state() eq "stopped" && !defined($vnode)) {
$poweron{$node->node_id} = $node;
}
......
......@@ -556,9 +556,16 @@ sub Resolve($$)
#
# Discover resources at an authority (CM).
#
sub DiscoverResources($$)
sub DiscoverResources($$;$$)
{
my ($self, $urn) = @_;
my ($self, $urn, $available, $compress) = @_;
if (! defined($available)) {
$available = 1;
}
if (! defined($compress)) {
$compress = 0;
}
my $manager_version = $self->Version();
return undef
......@@ -586,7 +593,8 @@ sub DiscoverResources($$)
my $method_args;
if ($manager_version == 2.0) {
$method_args->{'credentials'} = [$credential->asString()];
$method_args->{'available'} = 1;
$method_args->{'available'} = $available;
$method_args->{'compress'} = $compress;
}
else {
print STDERR "GeniAuthority::Discover: Unknown version at $self\n";
......
......@@ -14,7 +14,7 @@ use Getopt::Std;
#
sub usage()
{
print "Usage: ch_daemon [-d] [-n]\n";
print "Usage: ch_daemon [-s] [-d] [-n]\n";
exit(1);
}
my $optlist = "dns";
......@@ -183,7 +183,7 @@ sub ProbeCMs()
# Discover resources and cache; for the map client.
# Returns a string of xml.
#
my $resources = $authority->DiscoverResources();
my $resources = $authority->DiscoverResources(undef, 0);
# Errors will go to the log.
next
if (!defined($resources));
......
......@@ -2,7 +2,7 @@
#
# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2009, 2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -107,7 +107,11 @@ sub new($$$;$) {
$self->{MIN_VLAN} = $options->{'min_vlan'};
$self->{MAX_VLAN} = $options->{'max_vlan'};
if (($self->{MAX_VLAN} > 1024) && ($self->{MIN_VLAN} < 1000)) {
#
# Temporary removal by Leigh.
#
if (0 &&
($self->{MAX_VLAN} > 1024) && ($self->{MIN_VLAN} < 1000)) {
warn "ERROR: Some Cisco switches forbid creation of user vlans ".
"with 1000 < vlan number <= 1024\n";
return undef;
......
......@@ -474,6 +474,10 @@ sub newVlanNumber($$) {
$limit = $self->{MAX_VLAN};
while (++$number < $limit) {
# Temporary cisco hack to avoid reserved vlans.
next
if ($number >= 1000 && $number <= 1024);
if (!(grep {$_ == $number} @numbers)) {
#
# Reserve this number in the table. If we can actually
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
......@@ -15,6 +15,7 @@ MAINSITE = emulab.net
OURDOMAIN = @OURDOMAIN@
CVSSUPPORT = @CVSSUPPORT@
CHATSUPPORT = @CHATSUPPORT@
PGENISUPPORT = @PROTOGENI_SUPPORT@
# Filter program
HTMLINSTALL = $(INSTALL_SBINDIR)/htmlinstall
......@@ -108,6 +109,12 @@ NLFILES += $(wildcard $(SRCDIR)/netlab/*.png)
NLFILES += $(wildcard $(SRCDIR)/netlab/*.gif)
NLFILES += $(wildcard $(SRCDIR)/netlab/*.txt)
PGENIFILES =
ifeq ($(PGENISUPPORT),1)
PGENIFILES += $(wildcard $(SRCDIR)/protogeni/*.php3)
PGENIFILES += $(wildcard $(SRCDIR)/protogeni/*.xml)
endif
WEBDBFILES = $(wildcard $(SRCDIR)/webdb/*.php3)
WEBDBFILES += $(wildcard $(SRCDIR)/webdb/*.php)
......@@ -173,6 +180,7 @@ ALLDOCS = $(notdir $(DOCFILES))
ALLTUTS = $(notdir $(TUTFILES))
ALLICONS = $(notdir $(AUTOICONS))
ALLWEBDB = $(notdir $(WEBDBFILES))
ALLPGENI = $(notdir $(PGENIFILES))
ALLDOWNLOADS = $(notdir $(DOWNLOADFILES))
ALLCVSWEB = $(notdir $(CVSWEBFILES))
ALLOPSCVSWEB = $(notdir $(OPSCVSWEBFILES))
......@@ -193,6 +201,7 @@ INSTALLFILES = $(addprefix $(INSTALL_SBINDIR)/, htmlinstall) \
$(addprefix $(INSTALL_WWWDIR)/tutorial/, $(ALLTUTS)) \
$(addprefix $(INSTALL_WWWDIR)/doc/, $(ALLDOCS)) \
$(addprefix $(INSTALL_WWWDIR)/webdb/, $(ALLWEBDB)) \
$(addprefix $(INSTALL_WWWDIR)/protogeni/, $(ALLPGENI)) \
$(addprefix $(INSTALL_WWWDIR)/downloads/, $(ALLDOWNLOADS)) \
$(addprefix $(INSTALL_WWWDIR)/buildui/, $(ALLBUI)) \
$(addprefix $(INSTALL_WWWDIR)/netlab/, $(ALLNL)) \
......
<?xml version="1.0"?>
<cross-domain-policy>
<allow-access-from domain="*.emulab.net" />
<allow-access-from domain="*.protogeni.net" />
</cross-domain-policy>
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
chdir("..");
require("getsslcert.php3");
?>
......@@ -86,7 +86,8 @@ if ($geniuser) {
else {
$user = User::LookupByUUID($slice->creator_uuid());
if ($user) {
$rows[] = array("Creator" => $user->uid());
$url = CreateURL("showuser", $user);
$rows[] = array("Creator" => "<a href='$url'>". $user->uid() ."</a>");
}
}
......
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