Commit 213d2a15 authored by Leigh Stoller's avatar Leigh Stoller

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

parents e9476aef a66d4ae2
......@@ -686,14 +686,14 @@ sub Create($$$$$$)
GeniXML::SetText("hostname", $rspec, $hostname);
GeniXML::SetText("sshdport", $rspec, $sshdport)
if (defined($sshdport));
} else {
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);
}
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);
my $sliver = GeniSliver->Create($slice, $user, $resource_uuid, "Node",
$resource_id, $hrn, $nickname, $rspec);
return undef
......
......@@ -949,7 +949,7 @@ sub delPortVlan($$@) {
my $vlan_number = shift;
my @ports = @_;
return $self->updateOneVlan(0,0,0,$vlan_number,0,@ports);
return $self->updateOneVlan(0,0,0,$vlan_number,@ports);
}
sub updateOneVlan($$$$$@)
......
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