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

Change for the GEC8 demo: allow disk_image tags like this:

<disk_image
   name="urn:publicid:IDN+emulab.net+image+GeniSlices//UBUNTU91-LAMP" />

In other words, allow "GeniSlices" for the project, so we can add
images to be used from the rspec.
parent 8c6807e0
......@@ -766,19 +766,21 @@ sub GetTicketAuxAux($$$$$$$$$)
goto bad;
}
#
# For now, the project has to be emulab-ops.
# For now, the project has to be emulab-ops or the
# the current project.
#
if ($ospid ne TBOPSPID()) {
if (! ($ospid eq TBOPSPID() ||
$ospid eq $slice_experiment->pid())) {
$response =
GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Illegal project name in URN: $dname");
goto bad;
}
my $osinfo = OSinfo->LookupByName($os);
my $osinfo = OSinfo->Lookup($ospid, $os);
if (!defined($osinfo)) {
$response =
GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Bad osname in URN: $dname");
"Unknown image URN: $dname");
goto bad;
}
#
......
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