Author: fapeeler
Date: Tue Jul 13 20:28:14 2010
New Revision: 963852
URL: http://svn.apache.org/viewvc?rev=963852&view=rev
Log:
VCL-178
performing a check in get_request_info, if request_checkuser is disable then
set imagemeta checkuser to disabled. Done to reduce the extra code added to
new,reserved and inuse modules, etc.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=963852&r1=963851&r2=963852&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm Tue Jul 13
20:28:14 2010
@@ -135,13 +135,14 @@ $SUBROUTINE_MAPPINGS{request_preload}
$SUBROUTINE_MAPPINGS{request_preload_only} =
'$self->request_data->{PRELOADONLY}';
$SUBROUTINE_MAPPINGS{request_reservation_count} =
'$self->request_data->{RESERVATIONCOUNT}';
$SUBROUTINE_MAPPINGS{request_start_time} =
'$self->request_data->{start}';
-#$SUBROUTINE_MAPPINGS{request_stateid} = '$self->request_data->{stateid}';
-$SUBROUTINE_MAPPINGS{request_is_cluster_child} =
'$self->request_data->{SUBIMAGE}';
-$SUBROUTINE_MAPPINGS{request_test} = '$self->request_data->{test}';
-$SUBROUTINE_MAPPINGS{request_updated} =
'$self->request_data->{UPDATED}';
-#$SUBROUTINE_MAPPINGS{request_userid} = '$self->request_data->{userid}';
-$SUBROUTINE_MAPPINGS{request_state_name} =
'$self->request_data->{state}{name}';
-$SUBROUTINE_MAPPINGS{request_laststate_name} =
'$self->request_data->{laststate}{name}';
+$SUBROUTINE_MAPPINGS{request_checkuser} =
'$self->request_data->{checkuser}';
+#$SUBROUTINE_MAPPINGS{request_stateid} =
'$self->request_data->{stateid}';
+$SUBROUTINE_MAPPINGS{request_is_cluster_child} =
'$self->request_data->{SUBIMAGE}';
+$SUBROUTINE_MAPPINGS{request_test} =
'$self->request_data->{test}';
+$SUBROUTINE_MAPPINGS{request_updated} =
'$self->request_data->{UPDATED}';
+#$SUBROUTINE_MAPPINGS{request_userid} =
'$self->request_data->{userid}';
+$SUBROUTINE_MAPPINGS{request_state_name} =
'$self->request_data->{state}{name}';
+$SUBROUTINE_MAPPINGS{request_laststate_name} =
'$self->request_data->{laststate}{name}';
$SUBROUTINE_MAPPINGS{log_userid} = '$self->request_data->{log}{userid}';
$SUBROUTINE_MAPPINGS{log_nowfuture} = '$self->request_data->{log}{nowfuture}';
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=963852&r1=963851&r2=963852&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Tue Jul 13 20:28:14 2010
@@ -4393,6 +4393,7 @@ sub get_request_info {
request.end AS request_end,
request.daterequested AS request_daterequested,
request.datemodified AS request_datemodified,
+ request.checkuser AS request_checkuser,
requeststate.name AS requeststate_name,
@@ -4613,6 +4614,12 @@ sub get_request_info {
else {
# Image meta data found, add it to the hash
$request_info{reservation}{$reservation_id}{image}{imagemeta} =
\%imagemeta_info;
+
+ # If request_checkuser flag is set to 0 then disable
user checks here by setting imagemetacheckuser to 0
+ unless ($reservation_row{request_checkuser}){
+ notify($ERRORS{'DEBUG'}, 0, "request checkuser
flag is set to $reservation_row{request_checkuser}");
+
$request_info{reservation}{$reservation_id}{image}{imagemeta}{checkuser} =
$reservation_row{request_checkuser};
+ }
}
# Check if the computer associated with this reservation has a
vmhostid set
