Commit 6b6d1fac authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Minor fixes for tunnels.

parent db4d0c7b
...@@ -809,14 +809,14 @@ sub Create($$$$$$) ...@@ -809,14 +809,14 @@ sub Create($$$$$$)
print STDERR "Could not lookup node at clearinghouse\n"; print STDERR "Could not lookup node at clearinghouse\n";
goto bad; goto bad;
} }
my $certificate = GeniCertificate->LoadFromString($blob->{'cm'});
my $certificate = GeniCertificate->LoadFromString($blob->{'gid'});
goto bad goto bad
if (!defined($certificate)); if (!defined($certificate));
my $component = GeniComponent->Lookup($certificate->uuid()); my $component = GeniComponent->Lookup($certificate->uuid());
if (!defined($component)) { if (!defined($component)) {
$component = GeniComponent->CreateFromCertificate($certificate, $component = GeniComponent->CreateFromCertificate($certificate);
$blob->{'url'});
if (!defined($component)) { if (!defined($component)) {
print STDERR "Could not create component from $certificate\n"; print STDERR "Could not create component from $certificate\n";
goto bad; goto bad;
...@@ -866,14 +866,13 @@ sub Create($$$$$$) ...@@ -866,14 +866,13 @@ sub Create($$$$$$)
print STDERR "Could not lookup node at clearinghouse\n"; print STDERR "Could not lookup node at clearinghouse\n";
goto bad; goto bad;
} }
my $certificate = GeniCertificate->LoadFromString($blob->{'cm'}); my $certificate = GeniCertificate->LoadFromString($blob->{'gid'});
goto bad goto bad
if (!defined($certificate)); if (!defined($certificate));
my $component = GeniComponent->Lookup($certificate->uuid()); my $component = GeniComponent->Lookup($certificate->uuid());
if (!defined($component)) { if (!defined($component)) {
$component = GeniComponent->CreateFromCertificate($certificate, $component = GeniComponent->CreateFromCertificate($certificate);
$blob->{'url'});
if (!defined($component)) { if (!defined($component)) {
print STDERR "Could not create component from $certificate\n"; print STDERR "Could not create component from $certificate\n";
goto bad; goto bad;
......
...@@ -738,7 +738,7 @@ sub Create($$$$$) ...@@ -738,7 +738,7 @@ sub Create($$$$$)
"count" => 1, "count" => 1,
"vtype" => "$vtype", "vtype" => "$vtype",
"nodeid" => $node->node_id(), "nodeid" => $node->node_id(),
"verbose" => 1 }) < 0) { "verbose" => 0 }) < 0) {
print STDERR "Could not create new virtual node on $node\n"; print STDERR "Could not create new virtual node on $node\n";
return undef; return undef;
} }
......
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