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-stable
Commits
96c002ce
Commit
96c002ce
authored
Dec 09, 2008
by
Leigh B. Stoller
Browse files
Minor bug fix.
parent
64af9119
Changes
1
Show whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCM.pm.in
View file @
96c002ce
...
...
@@ -386,13 +386,14 @@ sub GetTicket($)
foreach
my
$
ref
(@{$
rspec
->{
'node'
}})
{
my
$
resource_uuid
=
$
ref
->{
'uuid'
};
my
$
node_nickname
=
$
ref
->{
'nickname'
};
my
$
virtualization_type
=
$
ref
->{
'virtualization_type'
};
my
$
node
;
#
#
Mostly
for
debugging
right
now
,
allow
a
wildcard
.
#
if
($
resource_uuid
eq
"*"
)
{
$
node
=
FindFreeNode
(@
nodeids
);
$
node
=
FindFreeNode
(
$
virtualization_type
,
@
nodeids
);
if
(
!defined($node)) {
$
response
=
GeniResponse
->
Create
(
GENIRESPONSE_UNAVAILABLE
,
...
...
@@ -803,7 +804,8 @@ sub ModifySliver($$$$$$)
if
(
ref
($
s
)
eq
"GeniSliver::Node"
)
{
$
nodelist
{$
s
->
resource_uuid
()}
=
$
s
;
}
elsif
(
ref
($
s
)
eq
"GeniAggregate::Link"
)
{
elsif
(
ref
($
s
)
eq
"GeniAggregate::Link"
||
ref
($
s
)
eq
"GeniAggregate::Tunnel"
)
{
$
linklist
{$
s
->
uuid
()}
=
$
s
;
}
else
{
...
...
@@ -989,8 +991,6 @@ sub ModifySliver($$$$$$)
#
have
changed
.
#
foreach
my
$
s
(
values
(%
linklist
))
{
my
$
needfree
=
1
;
if
(
! exists($rspec->{'link'}->{$s->hrn()})) {
$
s
->
UnProvision
();
$
s
->
Delete
();
...
...
@@ -2045,11 +2045,18 @@ sub GeniExperiment($)
#
#
#
sub
FindFreeNode
(@)
sub
FindFreeNode
(
$
@)
{
#
Already
going
to
allocate
these
.
my
$
vtype
=
shift
(@
_
);
my
$
type
=
"pc"
;
my
@
nodeids
=
@
_
;
if
(
defined
($
vtype
))
{
#
XXX
Need
to
implement
this
.
;
}
my
$
query_result
=
DBQueryWarn
(
"select uuid from geni_components"
);
return
undef
...
...
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