Changes to creating a snapshot of a VM container.

protogeni/lib/GeniCMV2.pm.in

@@ -51,6 +51,7 @@ my $BOSSNODE       = "@BOSSNODE@";
 my $OURDOMAIN      = "@OURDOMAIN@";
 my $PGENIDOMAIN    = "@PROTOGENI_DOMAIN@";
 my $ELABINELAB     = "@ELABINELAB@";
+my $TBBASE         = "@TBBASE@";
 my $CREATEEXPT     = "$TB/bin/batchexp";
 my $ENDEXPT        = "$TB/bin/endexp";
 my $NALLOC	   = "$TB/bin/nalloc";
@@ -2281,6 +2282,10 @@ sub CreateImage($)
     return $credential
 	if (GeniResponse::IsResponse($credential));
 
+    my $user = GeniCM::CreateUserFromCertificate($credential);
+    return $user
+	if (GeniResponse::IsResponse($user));
+    
     my ($slice, $aggregate) = Credential2SliceAggregate($credential);
     return $slice
 	if (defined($slice) && GeniResponse::IsResponse($slice));
@@ -2333,8 +2338,16 @@ sub CreateImage($)
     if ($slice->Lock() != 0) {
 	return GeniResponse->BusyResponse();
     }
-    my $opt = ($wholedisk ? "-e" : "");
+    my $opt  = "";
+    $opt .= " -e" if ($wholedisk);
 
+    #
+    # Let user override global setting.
+    #
+    if (exists($argref->{'global'})) {
+	$opt .= " -g " . ($argref->{'global'} ? "1" : "0");
+    }
+    
     my $output =
 	GeniUtil::ExecQuiet("$CLONEIMAGE $opt -s $imagename $node_id");
     # Not a typical op, so always print debugging info;
@@ -2358,6 +2371,7 @@ sub CreateImage($)
     #
     my $image_urn = GeniHRN::Generate($OURDOMAIN, "image",
 				      $pid . "//" . $imagename);
+    my $image_url = "$TBBASE/image_metadata.php?uuid=" . $image->uuid();
 
     #
     # We used the -s (nosnapshot) option above, to get the descriptor
@@ -2369,7 +2383,8 @@ sub CreateImage($)
     if ($mypid) {
 	# Let the child get going.
 	sleep(1);
-	return GeniResponse->Create(GENIRESPONSE_SUCCESS, $image_urn, $output);
+	return GeniResponse->Create(GENIRESPONSE_SUCCESS,
+				    [$image_urn, $image_url]);
     }
     # This switches the file that we are writing to. 
     libaudit::AuditFork();
@@ -2384,8 +2399,18 @@ sub CreateImage($)
     if ($?) {
 	print STDERR "Failed to take the snapshot of $node_id\n";
 	$slice->UnLock();
+	if ($user->email()) {
+	    libtestbed::SENDMAIL($user->email(),
+				 "Failed to clone image",
+				 "$output\n");
+	}
 	return -1;
     }
+    if ($user->email()) {
+	    libtestbed::SENDMAIL($user->email(),
+				 "Finished cloning image",
+				 "$output\n");
+    }
     $slice->UnLock();
     return 0;
 }