Author: fapeeler
Date: Mon Jul 12 20:20:27 2010
New Revision: 963470

URL: http://svn.apache.org/viewvc?rev=963470&view=rev
Log:
VCL-211

added check on forimaging - set to connected once user hits connect button. 
Skips initial check on confirming if user is connected

Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm

Modified: incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=963470&r1=963469&r2=963470&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm Mon Jul 12 20:20:27 
2010
@@ -291,19 +291,15 @@ sub process {
                $retval_conn = "connected";
                goto RETVALCONN;
        }
+       # Check if forimaging 
+       elsif ($request_forimaging){
+               notify($ERRORS{'OK'}, 0, "reservation is for image creation 
skipping user connection check");
+               $retval_conn = "connected";
+               goto RETVALCONN;
+       }
        else {
-               # Check for user connection
-               notify($ERRORS{'OK'}, 0, "checkuser flag is set to 1, checking 
user connection");
-               # Check for the normal user ID if this isn't an imaging request
-               # Check for "administrator" if this is an imaging request
-               if ($request_forimaging && $image_os_name =~ /win|vmwarewin/) {
-                       notify($ERRORS{'OK'}, 0, "forimaging flag is set to 1 
and imageosname is $image_os_name, checking for connection by administrator");
-                       $retval_conn = check_connection($nodename, 
$computer_ip_address, $computer_type, $remote_ip, $time_limit, $image_os_name, 
0, $request_id, "administrator",$image_os_type);
-               }
-               else {
-                       notify($ERRORS{'OK'}, 0, "forimaging flag is set to 
$request_forimaging and imageosname is $image_os_name, checking for connection 
by $user_unityid");
-                       $retval_conn = check_connection($nodename, 
$computer_ip_address, $computer_type, $remote_ip, $time_limit, $image_os_name, 
0, $request_id, $user_unityid,$image_os_type);
-               }
+               notify($ERRORS{'OK'}, 0, "checkuser flag=1 imageosname is 
$image_os_name, checking for user connection by $user_unityid");
+               $retval_conn = check_connection($nodename, 
$computer_ip_address, $computer_type, $remote_ip, $time_limit, $image_os_name, 
0, $request_id, $user_unityid,$image_os_type);
        } ## end else [ if (!$imagemeta_checkuser)
 
        RETVALCONN:


Reply via email to