Author: fapeeler
Date: Tue Jun 16 20:05:03 2009
New Revision: 785361
URL: http://svn.apache.org/viewvc?rev=785361&view=rev
Log:
VCL-3
Removed deptid and all references to dept table.
This is an unused variable.
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=785361&r1=785360&r2=785361&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm Tue Jun 16
20:05:03 2009
@@ -180,7 +180,6 @@
$SUBROUTINE_MAPPINGS{computer_current_image_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimageid}';
$SUBROUTINE_MAPPINGS{computer_deleted} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{deleted}';
-$SUBROUTINE_MAPPINGS{computer_department_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{deptid}';
$SUBROUTINE_MAPPINGS{computer_drive_type} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{drivetype}';
$SUBROUTINE_MAPPINGS{computer_dsa} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{dsa}';
$SUBROUTINE_MAPPINGS{computer_dsa_pub} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{dsapub}';
@@ -255,7 +254,6 @@
$SUBROUTINE_MAPPINGS{computer_currentimage_architecture} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{architecture}';
$SUBROUTINE_MAPPINGS{computer_currentimage_deleted} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{deleted}';
-$SUBROUTINE_MAPPINGS{computer_currentimage_deptid} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{deptid}';
$SUBROUTINE_MAPPINGS{computer_currentimage_forcheckout} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{forcheckout}';
$SUBROUTINE_MAPPINGS{computer_currentimage_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{id}';
$SUBROUTINE_MAPPINGS{computer_currentimage_imagemetaid} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimage}{imagemetaid}';
@@ -286,13 +284,10 @@
$SUBROUTINE_MAPPINGS{computer_currentimagerevision_revision} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimagerevision}{revision}';
$SUBROUTINE_MAPPINGS{computer_currentimagerevision_userid} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{currentimagerevision}{userid}';
-$SUBROUTINE_MAPPINGS{computer_dept_name} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{dept}{name}';
-$SUBROUTINE_MAPPINGS{computer_dept_prettyname} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{dept}{prettyname}';
$SUBROUTINE_MAPPINGS{computer_platform_name} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{platform}{name}';
$SUBROUTINE_MAPPINGS{computer_preferredimage_architecture} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{architecture}';
$SUBROUTINE_MAPPINGS{computer_preferredimage_deleted} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{deleted}';
-$SUBROUTINE_MAPPINGS{computer_preferredimage_deptid} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{deptid}';
$SUBROUTINE_MAPPINGS{computer_preferredimage_forcheckout} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{forcheckout}';
$SUBROUTINE_MAPPINGS{computer_preferredimage_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{id}';
$SUBROUTINE_MAPPINGS{computer_preferredimage_imagemetaid} =
'$self->request_data->{reservation}{RESERVATION_ID}{computer}{preferredimage}{imagemetaid}';
@@ -329,7 +324,6 @@
$SUBROUTINE_MAPPINGS{image_architecture} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{architecture}';
$SUBROUTINE_MAPPINGS{image_deleted} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{deleted}';
-$SUBROUTINE_MAPPINGS{image_deptid} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{deptid}';
$SUBROUTINE_MAPPINGS{image_forcheckout} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{forcheckout}';
$SUBROUTINE_MAPPINGS{image_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{id}';
$SUBROUTINE_MAPPINGS{image_identity} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{IDENTITY}';
@@ -354,8 +348,6 @@
$SUBROUTINE_MAPPINGS{image_test} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{test}';
$SUBROUTINE_MAPPINGS{image_updateimagename} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{UPDATEIMAGENAME}';
-$SUBROUTINE_MAPPINGS{image_dept_name} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{dept}{name}';
-$SUBROUTINE_MAPPINGS{image_dept_prettyname} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{dept}{prettyname}';
$SUBROUTINE_MAPPINGS{imagemeta_checkuser} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{imagemeta}{checkuser}';
$SUBROUTINE_MAPPINGS{imagemeta_id} =
'$self->request_data->{reservation}{RESERVATION_ID}{image}{imagemeta}{id}';
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=785361&r1=785360&r2=785361&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Tue Jun 16 20:05:03 2009
@@ -5478,7 +5478,6 @@
image.name AS image_name,
image.prettyname AS image_prettyname,
image.ownerid AS image_ownerid,
- image.deptid AS image_deptid,
image.platformid AS image_platformid,
image.OSid AS image_OSid,
image.imagemetaid AS image_imagemetaid,
@@ -5507,9 +5506,6 @@
imagerevision.comments AS imagerevision_comments,
imagerevision.imagename AS imagerevision_imagename,
- imagedept.name AS imagedept_name,
- imagedept.prettyname AS imagedept_prettyname,
-
imageplatform.name AS imageplatform_name,
OS.name AS OS_name,
@@ -5559,7 +5555,6 @@
computer.id AS computer_id,
computer.stateid AS computer_stateid,
computer.ownerid AS computer_ownerid,
- computer.deptid AS computer_deptid,
computer.platformid AS computer_platformid,
computer.scheduleid AS computer_scheduleid,
computer.currentimageid AS computer_currentimageid,
@@ -5589,9 +5584,6 @@
computer.hostpub AS computer_hostpub,
computer.vmhostid AS computer_vmhostid,
- computerdept.name AS computerdept_name,
- computerdept.prettyname AS computerdept_prettyname,
-
computerplatform.name AS computerplatform_name,
computerstate.name AS computerstate_name,
@@ -5615,7 +5607,6 @@
IMtype,
reservation,
image,
- dept imagedept,
platform imageplatform,
imagerevision,
OS,
@@ -5623,7 +5614,6 @@
computer,
provisioning computerprovisioning,
module computerprovisioningmodule,
- dept computerdept,
platform computerplatform,
schedule computerschedule,
state requeststate,
@@ -5637,13 +5627,11 @@
AND affiliation.id = user.affiliationid
AND reservation.requestid = request.id
AND image.id = imagerevision.imageid
- AND imagedept.id = image.deptid
AND imageplatform.id = image.platformid
AND imagerevision.id = reservation.imagerevisionid
AND OS.id = image.OSid
AND imageOSmodule.id = OS.moduleid
AND computer.id = reservation.computerid
- AND computerdept.id = computer.deptid
AND computerplatform.id = computer.platformid
AND computerschedule.id = computer.scheduleid
AND computerstate.id = computer.stateid
@@ -5794,9 +5782,6 @@
elsif ($key =~ /image_/) {
$request_info{reservation}{$reservation_id}{image}{$original_key} = $value;
}
- elsif ($key =~ /imagedept_/) {
-
$request_info{reservation}{$reservation_id}{image}{dept}{$original_key} =
$value;
- }
elsif ($key =~ /imageplatform_/) {
$request_info{reservation}{$reservation_id}{image}{platform}{$original_key} =
$value;
}
@@ -5821,9 +5806,6 @@
elsif ($key =~ /computer_/) {
$request_info{reservation}{$reservation_id}{computer}{$original_key} = $value;
}
- elsif ($key =~ /computerdept_/) {
-
$request_info{reservation}{$reservation_id}{computer}{dept}{$original_key} =
$value;
- }
elsif ($key =~ /computerplatform_/) {
$request_info{reservation}{$reservation_id}{computer}{platform}{$original_key}
= $value;
}
