Commit a3e674b1 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Look for explicit_request attribute on the node, if there is none on the

node type.
parent 5f65c653
#!/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-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -1206,6 +1206,7 @@ foreach $node (@nodenames) { ...@@ -1206,6 +1206,7 @@ foreach $node (@nodenames) {
# next # next
# if ($current->is_remote()); # if ($current->is_remote());
my $nodeobj = Node->Lookup($node);
my $type = $nodes{$node}; my $type = $nodes{$node};
my $class = $typemap{$type}->{'CLASS'}; my $class = $typemap{$type}->{'CLASS'};
my $delay_capacity = $typemap{$type}->{'DELAYCAP'}; my $delay_capacity = $typemap{$type}->{'DELAYCAP'};
...@@ -1255,9 +1256,14 @@ foreach $node (@nodenames) { ...@@ -1255,9 +1256,14 @@ foreach $node (@nodenames) {
if ($type ne $class) { if ($type ne $class) {
push(@types, "$class:1"); push(@types, "$class:1");
} }
my $explicit = my $explicit =
$typemap{$type}->{'TYPEINFO'}->GetAttribute("explicit_request"); $typemap{$type}->{'TYPEINFO'}->GetAttribute("explicit_request");
if (!defined($explicit) && defined($nodeobj)) {
#
# Look on the node itself.
#
$nodeobj->NodeAttribute("explicit_request", \$explicit);
}
if (defined($explicit)) { if (defined($explicit)) {
push(@features, "$type-explicit:1"); push(@features, "$type-explicit:1");
} }
......
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