Commit 036ab0ca authored by Gary Wong's avatar Gary Wong

Oh dear. The component manager was looking for its URN in a different

attribute than Jon's client was sending it in.  Let's agree on the name
and see if things work any better.
parent 88d01782
......@@ -579,16 +579,14 @@ sub GetTicket($;$)
foreach my $ref (@{$ticket->rspec()->{'node'}}) {
my $resource_uuid = $ref->{'component_uuid'} || $ref->{'uuid'};
my $manager_uuid = $ref->{'component_manager_uuid'};
my $manager_urn = $ref->{'component_manager_urn'};
my $node_nickname = $ref->{'virtual_id'} || $ref->{'nickname'};
my $colocate = $ref->{'colocate'} || $ref->{'phys_nickname'};
# Let remote nodes pass through.
next
if (defined($manager_urn) &&
!GeniHRN::Equal( $manager_urn, $ENV{'MYURN'} ) );
next
if (defined($manager_uuid) && $manager_uuid ne $ENV{'MYUUID'});
if (defined($manager_uuid) &&
!GeniHRN::Equal( $manager_uuid, $ENV{'MYURN'} ) &&
$manager_uuid ne $ENV{'MYUUID'});
my $node = Node->Lookup($resource_uuid);
if (!defined($node)) {
......@@ -627,10 +625,9 @@ sub GetTicket($;$)
# Let remote nodes pass through.
next
if (defined($manager_urn) &&
!GeniHRN::Equal( $manager_urn, $ENV{'MYURN'} ) );
next
if (defined($manager_uuid) && $manager_uuid ne $ENV{'MYUUID'});
if (defined($manager_uuid) &&
!GeniHRN::Equal( $manager_uuid, $ENV{'MYURN'} ) &&
$manager_uuid ne $ENV{'MYUUID'});
if (defined($virtualization_type)) {
if ($virtualization_type eq "emulab-vnode") {
......@@ -1299,10 +1296,9 @@ sub SliverWork($$)
# Let remote nodes pass through.
next
if (defined($manager_urn) &&
!GeniHRN::Equal( $manager_urn, $ENV{'MYURN'} ) );
next
if (defined($manager_uuid) && $manager_uuid ne $ENV{'MYUUID'});
if (defined($manager_uuid) &&
!GeniHRN::Equal( $manager_uuid, $ENV{'MYURN'} ) &&
$manager_uuid ne $ENV{'MYUUID'});
my $node = Node->Lookup($resource_uuid);
if (!defined($node)) {
......@@ -1519,10 +1515,9 @@ sub SliverWork($$)
# Let remote nodes pass through.
next
if (defined($manager_urn) &&
!GeniHRN::Equal( $manager_urn, $ENV{'MYURN'} ) );
next
if (defined($manager_uuid) && $manager_uuid ne $ENV{'MYUUID'});
if (defined($manager_uuid) &&
!GeniHRN::Equal( $manager_uuid, $ENV{'MYURN'} ) &&
$manager_uuid ne $ENV{'MYUUID'});
# Already in the aggregate?
next
......
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