Commit dd4495d6 authored by Leigh B Stoller's avatar Leigh B Stoller

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

parents f4582feb b4547d11
......@@ -652,8 +652,9 @@ sub Create($$$$$$)
return undef;
}
my $hrn;
my $sshdport;
my $sshdport = 22;
my $hostname;
my $phostname;
my $resource_id;
my $sliver_uuid;
......@@ -671,13 +672,14 @@ sub Create($$$$$$)
$sliver_uuid = $vnode->uuid();
$resource_id = $vnode->node_id();
$hostname = GeniUtil::FindHostname($vnode->node_id());
$phostname = GeniUtil::FindHostname($vnode->phys_nodeid());
$sshdport = $vnode->sshdport();
}
else {
$hrn = "${PGENIDOMAIN}." . $node->node_id();
$sliver_uuid = $node->uuid();
$resource_id = $node->node_id();
$hostname = GeniUtil::FindHostname($node->node_id());
$phostname = $hostname = GeniUtil::FindHostname($node->node_id());
}
#
......@@ -687,6 +689,13 @@ sub Create($$$$$$)
GeniXML::SetText("hostname", $rspec, $hostname);
GeniXML::SetText("sshdport", $rspec, $sshdport) if (defined($sshdport));
# This is a version 2.0 thing.
my $services = GeniXML::AddElement("services", $rspec);
my $login = GeniXML::AddElement("login", $services);
GeniXML::SetText("authentication", $login, "ssh-keys");
GeniXML::SetText("hostname", $login, $phostname);
GeniXML::SetText("port", $login, $sshdport);
return GeniSliver->Create($slice, $user, $sliver_uuid, $resource_uuid,
"Node", $resource_id, $hrn, $nickname, $rspec);
}
......
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