Commit 13b09515 authored by Leigh B Stoller's avatar Leigh B Stoller

Temp fix for text model do not put URNS into the fix slots. Needs

more thought.
parent aef7d343
...@@ -303,7 +303,8 @@ sub createFixedNode ($$$) ...@@ -303,7 +303,8 @@ sub createFixedNode ($$$)
{ {
my ($self, $vnode, $pnode) = @_; my ($self, $vnode, $pnode) = @_;
my $ref = { 'vnode' => $vnode, 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'})) { if (!exists($self->rspec()->{'fixed'})) {
$self->rspec()->{'fixed'} = []; $self->rspec()->{'fixed'} = [];
...@@ -785,11 +786,10 @@ sub LoadCurrentResources($) ...@@ -785,11 +786,10 @@ sub LoadCurrentResources($)
my $node_id = $pnode->node_id(); my $node_id = $pnode->node_id();
if ($pnode->isvirtnode()) { if ($pnode->isvirtnode()) {
$self->fixednodes()->{$vname} = $pnode->phys_nodeid(); $node_id = $pnode->phys_nodeid();
}
else {
$self->fixednodes()->{$vname} = $node_id;
} }
$self->fixednodes()->{$vname} = $node_id;
$self->printdb(" fixing $vname -> $node_id\n");
} }
return 0; return 0;
} }
...@@ -3511,6 +3511,10 @@ sub AddLinkToSolution($$$$$$$$) ...@@ -3511,6 +3511,10 @@ sub AddLinkToSolution($$$$$$$$)
$member0->_lannode($nodeB); $member0->_lannode($nodeB);
$member0->_lanport($portB); $member0->_lanport($portB);
} }
else {
$member0->_lannode("null");
$member0->_lanport("null");
}
} }
} }
elsif (($lan,$virtA) = elsif (($lan,$virtA) =
...@@ -7252,7 +7256,9 @@ sub processNodeRspec ($$$$) ...@@ -7252,7 +7256,9 @@ sub processNodeRspec ($$$$)
$rspecnode->setAttribute('client_id', $node->{'name'}); $rspecnode->setAttribute('client_id', $node->{'name'});
$rspecnode->setAttribute('component_manager_id', $node->{'cm'}); $rspecnode->setAttribute('component_manager_id', $node->{'cm'});
if ($fixedto ne '') { 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'}; my $isnodestatic = $node->{'node_static'};
......
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