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
13b09515
Commit
13b09515
authored
Aug 09, 2010
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Temp fix for text model do not put URNS into the fix slots. Needs
more thought.
parent
aef7d343
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
tbsetup/libvtop.pm.in
tbsetup/libvtop.pm.in
+12
-6
No files found.
tbsetup/libvtop.pm.in
View file @
13b09515
...
...
@@ -303,7 +303,8 @@ sub createFixedNode ($$$)
{
my
($
self
,
$
vnode
,
$
pnode
)
=
@
_
;
my
$
ref
=
{
'vnode'
=>
$
vnode
,
'pnode'
=>
GeniHRN
::
Generate
($
OURDOMAIN
,
"node"
,
$
pnode
)
#
XXX
Going
to
need
a
URN
in
rspec
output
...
'pnode'
=>
$
pnode
,
};
if
(
!exists($self->rspec()->{'fixed'})) {
$
self
->
rspec
()->{
'fixed'
}
=
[];
...
...
@@ -785,11 +786,10 @@ sub LoadCurrentResources($)
my
$
node_id
=
$
pnode
->
node_id
();
if
($
pnode
->
isvirtnode
())
{
$
self
->
fixednodes
()->{$
vname
}
=
$
pnode
->
phys_nodeid
();
}
else
{
$
self
->
fixednodes
()->{$
vname
}
=
$
node_id
;
$
node_id
=
$
pnode
->
phys_nodeid
();
}
$
self
->
fixednodes
()->{$
vname
}
=
$
node_id
;
$
self
->
printdb
(
" fixing $vname -> $node_id
\n
"
);
}
return
0
;
}
...
...
@@ -3511,6 +3511,10 @@ sub AddLinkToSolution($$$$$$$$)
$member0->_lannode($nodeB);
$member0->_lanport($portB);
}
else {
$member0->_lannode("null");
$member0->_lanport("null");
}
}
}
elsif (($lan,$virtA) =
...
...
@@ -7252,7 +7256,9 @@ sub processNodeRspec ($$$$)
$rspecnode->setAttribute('
client_id
', $node->{'
name
'});
$rspecnode->setAttribute('
component_manager_id
', $node->{'
cm
'});
if ($fixedto ne '') {
$rspecnode->setAttribute('
component_id
', $fixedto);
my ($authority,undef,undef) = GeniHRN::Parse($node->{'
cm
'});
$rspecnode->setAttribute('
component_id
',
GeniHRN::Generate($authority, "node", $fixedto));
}
my $isnodestatic = $node->{'
node_static
'};
...
...
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