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 edb52102 authored by Leigh B Stoller's avatar Leigh B Stoller

Add general feature support (emulab:fd) to rspec parsing.

parent e3d2c245
......@@ -1685,6 +1685,16 @@ sub GetTicketAuxAux($$$$$$$$$$)
"attrvalue" => $attr_ref->{'value'}});
}
#
# Look for node desires that pass through to the backend.
#
foreach my $desire_ref (GeniXML::GetNodeDesires($ref)) {
$virtexperiment->NewTableRow("virt_node_desires",
{"vname" => $node_nickname,
"desire" => $desire_ref->{'name'},
"weight" => $desire_ref->{'weight'}});
}
#
# Local blockstores
#
......
......@@ -633,6 +633,23 @@ sub GetNodeAttributes($)
return @result;
}
sub GetNodeDesires($)
{
my ($node) = @_;
my @result = ();
my @desires = FindNodesNS("n:fd", $node, $EMULAB_NS)->get_nodelist();
foreach my $desire (@desires) {
my $name = GetText("name", $desire);
my $weight = GetText("weight", $desire);
if (defined($name) && $name ne "" && defined($weight)) {
push(@result, {"name" => $name, "weight" => $weight});
}
}
return @result;
}
sub GetStartupCommand($)
{
my ($node) = @_;
......
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