Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
6b001436
Commit
6b001436
authored
Feb 24, 2012
by
Jonathon Duerig
Browse files
Fix duplicate check for nodes.
parent
ba45029a
Changes
1
Show whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCM.pm.in
View file @
6b001436
...
...
@@ -831,12 +831,6 @@ sub GetTicketAuxAux($$$$$$$$$)
}
$node = $pnode;
}
if (exists($namemap{$node_nickname})) {
$response =
GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Duplicate node $node_nickname");
goto bad;
}
$namemap{$node_nickname} = $node;
$colomap{$colocate} = $node
if (defined($colocate));
...
...
@@ -845,6 +839,8 @@ sub GetTicketAuxAux($$$$$$$$$)
print GeniXML::Serialize($rspec);
my %nodeexistsmap = ();
foreach my $ref (GeniXML::FindNodes("n:node", $rspec)->get_nodelist()) {
my $component_id = GeniXML::GetNodeId($ref);
my $vnode_id = GeniXML::GetVnodeId($ref);
...
...
@@ -864,6 +860,14 @@ sub GetTicketAuxAux($$$$$$$$$)
my $isbridge = 0;
my $isfirewall = 0;
if (exists($nodeexistsmap{$node_nickname})) {
$response =
GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Duplicate node $node_nickname");
goto bad;
}
$nodeexistsmap{$node_nickname} = 1;
# Always populate iface2node mapping, even if we let the node
# pass through.
foreach my $linkref (GeniXML::FindNodes("n:interface",
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment