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 4eb3eabf authored by Gary Wong's avatar Gary Wong Committed by Kirk Webb

Annotate manifest with adb_port and adb_target attributes.

parent d6a221ec
......@@ -804,6 +804,7 @@ sub AnnotateManifest($)
print STDERR "Could not map node $self to its object\n";
return undef;
}
my $vname = $node->vname();
my $user = GeniUser->Lookup($self->creator_uuid(), 1);
if (!defined($user)) {
print STDERR "Could not map sliver $self to its creator\n";
......@@ -824,7 +825,6 @@ sub AnnotateManifest($)
my $ipv4;
if ($node->isvirtnode()) {
my $vname = $node->vname();
my $public_control;
$experiment->GetVirtNodeAttribute( $vname, "routable_control_ip",
\$public_control );
......@@ -916,6 +916,18 @@ sub AnnotateManifest($)
(defined($tipserver) ? $tipserver : $sshdhost));
}
my $adb_port;
$experiment->GetVirtNodeAttribute( $vname, "adb_port",
\$adb_port );
GeniXML::SetText( "adb_port", $rspec, $adb_port )
if( defined( $adb_port ) );
my $adb_target;
$experiment->GetVirtNodeAttribute( $vname, "adb_target",
\$adb_target );
GeniXML::SetText( "adb_target", $rspec, $adb_target )
if( defined( $adb_target ) );
if ($self->UpdateRspec($rspec)) {
print STDERR "Could not insert annotated manifest for node $self ".
"into database";
......
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