Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
6a2dd971
Commit
6a2dd971
authored
Sep 06, 2011
by
Jonathon Duerig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: Correctly print out component_ids in manifest.
This was masked by the previous bug until it was fixed.
parent
3818e062
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
protogeni/lib/GeniCMV2.pm.in
protogeni/lib/GeniCMV2.pm.in
+2
-2
protogeni/lib/GeniSliver.pm.in
protogeni/lib/GeniSliver.pm.in
+8
-4
No files found.
protogeni/lib/GeniCMV2.pm.in
View file @
6a2dd971
...
...
@@ -980,7 +980,7 @@ sub SliverStatus($)
}
my
$
sliver_urn
=
$
sliver
->
sliver_urn
();
my
$
component_urn
=
$
sliver
->
component_urn
();
my
$
resource_id
=
$
sliver
->
resource_id
();
my
$
state
=
$
sliver
->
state
();
my
$
status
=
$
sliver
->
status
();
my
$
error
=
""
;
...
...
@@ -993,7 +993,7 @@ sub SliverStatus($)
$
error
=
$
sliver
->
ErrorLog
();
}
$
blob
->{
'details'
}->{$
sliver_urn
}
=
{
"component_urn"
=>
$
component_urn
,
"component_urn"
=>
$
resource_id
,
"state"
=>
$
state
,
"status"
=>
$
status
,
"error"
=>
$
error
,
...
...
protogeni/lib/GeniSliver.pm.in
View file @
6a2dd971
...
...
@@ -647,8 +647,9 @@ sub ErrorLog($)
return $bootlog;
}
# Return the component URN. This is how a resource is resolved.
sub component_urn($)
# Return the resource URN. This is how a resource is resolved.
# Resource urns may differ from component_urns (pcvm201-1 rather than pc201).
sub resource_urn($)
{
my ($self) = @_;
...
...
@@ -737,6 +738,9 @@ sub AnnotateManifest($)
my $hostname = GeniUtil::FindHostname($node->node_id());
my $phostname = $hostname;
my $vhostname = GeniUtil::FindVHostname($experiment, $node);
my $component_urn = GeniHRN::Generate("@OURDOMAIN@", "node",
$node->phys_nodeid())
;
if ($node->isvirtnode()) {
$sshdport = $node->sshdport();
...
...
@@ -752,10 +756,10 @@ sub AnnotateManifest($)
if (defined($sshdport));
GeniXML::SetText("sliver_uuid", $rspec, $self->uuid());
GeniXML::SetText("sliver_urn", $rspec, $self->sliver_urn());
GeniXML::SetText("component_urn", $rspec, $self->
component
_urn());
GeniXML::SetText("component_urn", $rspec, $self->
resource
_urn());
} else {
GeniXML::SetText("sliver_id", $rspec, $self->sliver_urn());
GeniXML::SetText("component_id", $rspec, $
self->component_urn()
);
GeniXML::SetText("component_id", $rspec, $
component_urn
);
my $host = GeniXML::FindFirst("n:host", $rspec);
if (! defined($host)) {
$host = GeniXML::AddElement("host", $rspec);
...
...
Write
Preview
Markdown
is supported
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