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
ef3a3f6a
Commit
ef3a3f6a
authored
Jun 10, 2010
by
Jonathon Duerig
Browse files
Default rspec in Resolve to 0.1.
We will deal with Resolve versioning issues later.
parent
2abec349
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCM.pm.in
View file @
ef3a3f6a
...
...
@@ -158,7 +158,7 @@ sub Resolve($)
undef
,
"Nothing here by that name"
);
}
my
$
rspec
=
GetAdvertisement
(
0
,
$
node
->
node_id
());
my
$
rspec
=
GetAdvertisement
(
0
,
$
node
->
node_id
()
,
"0.1"
);
if
(
! defined($rspec)) {
return
GeniResponse
->
Create
(
GENIRESPONSE_ERROR
,
undef
,
"Could not start avail"
);
...
...
@@ -248,7 +248,7 @@ sub DiscoverResourcesAux($$$)
#
# Acquire the advertisement from ptopgen and compress it if requested.
#
my $xml = GetAdvertisement($available, undef);
my $xml = GetAdvertisement($available, undef
, "0.2"
);
if (! defined($xml)) {
return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Could not start avail");
...
...
@@ -266,12 +266,12 @@ sub DiscoverResourcesAux($$$)
#
# Use ptopgen in xml mode to spit back an xml file.
#
sub GetAdvertisement($$)
sub GetAdvertisement($$
$
)
{
my ($available, $pc) = @_;
my ($available, $pc
, $version
) = @_;
my $xml = undef;
my $invocation = "$PTOPGEN -x -g
0.2
-r -p GeniSlices";
my $invocation = "$PTOPGEN -x -g
$version
-r -p GeniSlices";
$invocation .= " -a" unless $available;
if (defined($pc)) {
$invocation .= " -1 $pc";
...
...
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