You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2014/12/09 23:06:33 UTC
svn commit: r1644202 - in /vcl/trunk/managementnode: bin/ lib/VCL/
lib/VCL/Module/ lib/VCL/Module/OS/ lib/VCL/Module/Provisioning/
Author: arkurth
Date: Tue Dec 9 22:06:32 2014
New Revision: 1644202
URL: http://svn.apache.org/r1644202
Log:
VCL-702
More sloppy code cleanup. The backend code contains over 1,200 subroutines with all lowercase names. Why do subroutines with uppercase letters keep popping up? Renamed the following subroutines:
OS.pm
server_request_set_fixedIP > server_request_set_fixed_ip
confirm_fixedIP_is_available > confirm_fixed_ip_is_available
update_fixedIP_info > update_fixed_ip_info
DataStructure.pm
get_next_image_dataStructure > get_next_image_data_structure
blockrequest.pm
update_blockTimes_processing > update_block_times_processing
clear_blockTimes > clear_block_times
clear_blockComputers > clear_block_computers
vbox.pm
control_VM > control_vm
utils.pm
notify_via_IM > notify_via_im
get_current_image_contents_noDS > get_current_image_contents_no_data_structure
Modified:
vcl/trunk/managementnode/bin/health_check.pl
vcl/trunk/managementnode/bin/vcld
vcl/trunk/managementnode/lib/VCL/DataStructure.pm
vcl/trunk/managementnode/lib/VCL/Module/OS.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm
vcl/trunk/managementnode/lib/VCL/blockrequest.pm
vcl/trunk/managementnode/lib/VCL/healthcheck.pm
vcl/trunk/managementnode/lib/VCL/image.pm
vcl/trunk/managementnode/lib/VCL/inuse.pm
vcl/trunk/managementnode/lib/VCL/new.pm
vcl/trunk/managementnode/lib/VCL/reclaim.pm
vcl/trunk/managementnode/lib/VCL/reserved.pm
vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: vcl/trunk/managementnode/bin/health_check.pl
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/health_check.pl?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/health_check.pl (original)
+++ vcl/trunk/managementnode/bin/health_check.pl Tue Dec 9 22:06:32 2014
@@ -77,16 +77,16 @@ our $HELP = 0;
#$HELP = $OPTIONS{help} if (defined($OPTIONS{help} && $OPTIONS{help}));
#$STAGE = $OPTIONS{powerdown} if (defined($OPTIONS{powerdown} && $OPTIONS{powerdown}));
-if($STAGE){
+if ($STAGE) {
- unless($STAGE =~ /available|all/){
+ unless($STAGE =~ /available|all/) {
print "\nInvalid powerdown option\n\n";
help;
exit;
}
}
-if($HELP){
+if ($HELP) {
help_healthcheck();
exit;
}
Modified: vcl/trunk/managementnode/bin/vcld
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/vcld?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/vcld (original)
+++ vcl/trunk/managementnode/bin/vcld Tue Dec 9 22:06:32 2014
@@ -774,7 +774,7 @@ sub daemonize {
#Create EX lock on lockfile
my $subsys_lock = "/var/lock/subsys/$PROCESSNAME";
sysopen(LOCKFILE, $subsys_lock, O_RDONLY | O_CREAT ) or die "unable to open lock file: $PIDFILE \n";
- unless(flock(LOCKFILE, LOCK_EX|LOCK_NB)){
+ unless(flock(LOCKFILE, LOCK_EX|LOCK_NB)) {
notify($ERRORS{'WARNING'}, $LOGFILE, " An process instance of $PROCESSNAME is already running ");
print STDOUT "\nFailed to start.\n\nAn instance of $PROCESSNAME is already running\n\n";
print STDERR "\nFailed to start.\n\nAn instance of $PROCESSNAME is already running\n\n";
Modified: vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/DataStructure.pm Tue Dec 9 22:06:32 2014
@@ -1269,7 +1269,7 @@ sub get_state_name {
#/////////////////////////////////////////////////////////////////////////////
-=head2 get_next_image_dataStructure
+=head2 get_next_image_data_structure
Parameters : none
Returns : array
@@ -1278,7 +1278,7 @@ sub get_state_name {
=cut
-sub get_next_image_dataStructure {
+sub get_next_image_data_structure {
my $self = shift;
# Get the current image data in case something goes wrong
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS.pm Tue Dec 9 22:06:32 2014
@@ -138,7 +138,7 @@ sub pre_capture {
=cut
sub reserve {
- my $self = shift;
+ my $self = shift;
if (ref($self) !~ /VCL::Module/) {
notify($ERRORS{'CRITICAL'}, 0, "subroutine was called as a function, it must be called as a class method");
return;
@@ -883,7 +883,7 @@ sub update_ssh_known_hosts {
#/////////////////////////////////////////////////////////////////////////////
-=head2 server_request_set_fixedIP
+=head2 server_request_set_fixed_ip
Parameters : none
Returns : If successful: true
@@ -892,7 +892,7 @@ sub update_ssh_known_hosts {
=cut
-sub server_request_set_fixedIP {
+sub server_request_set_fixed_ip {
my $self = shift;
if (ref($self) !~ /VCL::Module/i) {
notify($ERRORS{'CRITICAL'}, 0, "subroutine was called as a function, it must be called as a class method");
@@ -912,12 +912,12 @@ sub server_request_set_fixedIP {
if ($server_request_id) {
if ($server_request_fixedIP) {
#Update the info related to fixedIP
- if (!$self->update_fixedIP_info()) {
+ if (!$self->update_fixed_ip_info()) {
notify($ERRORS{'WARNING'}, 0, "Unable to update information related fixedIP for server_request $server_request_id");
}
#Confirm requested IP is not being used
- if (!$self->confirm_fixedIP_is_available()) {
+ if (!$self->confirm_fixed_ip_is_available()) {
#failed, insert into loadlog, fail reservation
insertloadlog($reservation_id, $computer_id, "failed","$server_request_fixedIP is NOT available");
return 0;
@@ -969,7 +969,7 @@ sub server_request_set_fixedIP {
#/////////////////////////////////////////////////////////////////////////////
-=head2 confirm_fixedIP_is_available
+=head2 confirm_fixed_ip_is_available
Parameters : none
Returns : If successful: true
@@ -981,7 +981,7 @@ sub server_request_set_fixedIP {
=cut
-sub confirm_fixedIP_is_available {
+sub confirm_fixed_ip_is_available {
my $self = shift;
if (ref($self) !~ /VCL::Module/i) {
notify($ERRORS{'CRITICAL'}, 0, "subroutine was called as a function, it must be called as a class method");
@@ -3301,7 +3301,7 @@ sub get_tools_file_paths {
#/////////////////////////////////////////////////////////////////////////////
-=head2 update_fixedIP_info
+=head2 update_fixed_ip_info
Parameters :
Returns : 1, 0
@@ -3309,7 +3309,7 @@ sub get_tools_file_paths {
=cut
-sub update_fixedIP_info {
+sub update_fixed_ip_info {
my $self = shift;
unless (ref($self) && $self->isa('VCL::Module')) {
@@ -3716,7 +3716,7 @@ sub firewall_compare_update {
Parameters :data hash
Returns : 0 or 1
Description : creates or updates the cluster_info file
- updates firewall so each node can communicate
+ updates firewall so each node can communicate
=cut
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Tue Dec 9 22:06:32 2014
@@ -723,8 +723,8 @@ sub update_public_hostname {
Parameters : hostname
Returns : boolean
Description : updates the static hostname file on node, so hostname persists across reboots
- seperated from update_public_hostname as the file location and format can differ
- accross Linux distributions
+ seperated from update_public_hostname as the file location and format can differ
+ accross Linux distributions
=cut
@@ -2374,9 +2374,9 @@ sub get_network_configuration {
$network_configuration->{$interface_name}{ip_address}{$1} = $3;
$network_configuration->{$interface_name}{broadcast_address} = $2;
}
-
+
# inet 10.25.14.3 netmask 255.255.240.0 broadcast 10.25.15.255
- if ($ifconfig_line =~ /inet\s+([\d\.]+)\s+netmask\s+([\d\.]+)\s+broadcast\s+([\d\.]+)/) {
+ if ($ifconfig_line =~ /inet\s+([\d\.]+)\s+netmask\s+([\d\.]+)\s+broadcast\s+([\d\.]+)/) {
$network_configuration->{$interface_name}{ip_address}{$1} = $2;
$network_configuration->{$interface_name}{broadcast_address} = $3;
}
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm Tue Dec 9 22:06:32 2014
@@ -143,7 +143,7 @@ sub load {
my ($myimagename, $myvmx, $myvmdir, $mybasedirname, $requestedimagenamebase);
# preform cleanup
- if ($self->control_VM("remove")) {
+ if ($self->control_vm("remove")) {
notify($ERRORS{'OK'}, 0, "removed node $shortname from vmhost $vmhost_hostname");
}
@@ -582,7 +582,7 @@ sub capture { ## This is going to need t
}
else {
# Image has been captured, remove the VM
- $self->control_VM("remove");
+ $self->control_vm("remove");
}
} elsif ($vmprofile_vmdisk =~ /shared/) { ## end if ($vmprofile_vmdisk =~ /(local|dedicated)/)
@@ -685,7 +685,7 @@ sub remove_snapshots {
### This section will be next.
-sub control_VM {
+sub control_vm {
my $self = shift;
my $ret = 0;
@@ -772,7 +772,7 @@ sub control_VM {
my $dirstructure = 0;
my $vmison = 0;
return $ret;
-} ## end sub control_VM
+} ## end sub control_vm
#/////////////////////////////////////////////////////////////////////////////
@@ -1098,7 +1098,7 @@ sub post_maintenance_action {
my $computer_id = $self->data->get_computer_id();
my $vmhost_hostname = $self->data->get_vmhost_hostname;
- if ($self->control_VM("remove")) {
+ if ($self->control_vm("remove")) {
notify($ERRORS{'OK'}, 0, "removed node $computer_short_name from vmhost $vmhost_hostname");
}
Modified: vcl/trunk/managementnode/lib/VCL/blockrequest.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/blockrequest.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/blockrequest.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/blockrequest.pm Tue Dec 9 22:06:32 2014
@@ -171,7 +171,7 @@ sub process {
if ($blockrequest_mode eq "start") {
#update processed flag for request
- if (update_blockTimes_processing($blocktime_id, 1)) {
+ if (update_block_times_processing($blocktime_id, 1)) {
notify($ERRORS{'OK'}, 0, "updated process flag on blocktime_id= $blocktime_id");
}
@@ -311,10 +311,10 @@ EOF
} ## end if ($blockrequest_mode eq "start")
elsif ($blockrequest_mode eq "end") {
# remove blockTime entry for this request
- if (clear_blockComputers($blocktime_id)) {
+ if (clear_block_computers($blocktime_id)) {
notify($ERRORS{'OK'}, 0, "Removed computers from blockComputers table for blocktime_id=$blocktime_id");
}
- if (clear_blockTimes($blocktime_id)) {
+ if (clear_block_times($blocktime_id)) {
notify($ERRORS{'OK'}, 0, "Removed blocktime_id=$blocktime_id from blockTimes table");
}
@@ -402,7 +402,7 @@ sub process_block_time {
#/////////////////////////////////////////////////////////////////////////////
-=head2 update_blockTimes_processing
+=head2 update_block_times_processing
Parameters : $blockTimes_id, $processing
Returns : 0 or 1
@@ -410,7 +410,7 @@ sub process_block_time {
=cut
-sub update_blockTimes_processing {
+sub update_block_times_processing {
my ($blockTimes_id, $processing) = @_;
my ($package, $filename, $line, $sub) = caller(0);
@@ -443,7 +443,7 @@ sub update_blockTimes_processing {
notify($ERRORS{'WARNING'}, 0, "unable to update blockTimes table, id=$blockTimes_id, processing=$processing");
return 0;
}
-} ## end sub update_blockTimes_processing
+} ## end sub update_block_times_processing
#/////////////////////////////////////////////////////////////////////////////
@@ -528,7 +528,7 @@ sub udpate_block_request_status {
#/////////////////////////////////////////////////////////////////////////////
-=head2 clear_blockTimes
+=head2 clear_block_times
Parameters : $blockTimes_id
Returns : 0 or 1
@@ -536,7 +536,7 @@ sub udpate_block_request_status {
=cut
-sub clear_blockTimes {
+sub clear_block_times {
my ($blockTimes_id) = @_;
my ($package, $filename, $line, $sub) = caller(0);
@@ -564,11 +564,11 @@ sub clear_blockTimes {
notify($ERRORS{'WARNING'}, 0, "unable to deleted blockTimes_id $blockTimes_id blockTimes table ");
return 0;
}
-} ## end sub clear_blockTimes
+} ## end sub clear_block_times
#/////////////////////////////////////////////////////////////////////////////
-=head2 clear_blockComputers
+=head2 clear_block_computers
Parameters : $blockTimes_id, $processing
Returns : 0 or 1
@@ -576,7 +576,7 @@ sub clear_blockTimes {
=cut
-sub clear_blockComputers {
+sub clear_block_computers {
my ($blockTimes_id) = @_;
my ($package, $filename, $line, $sub) = caller(0);
@@ -604,7 +604,7 @@ sub clear_blockComputers {
notify($ERRORS{'WARNING'}, 0, "unable to delete blockComputers for id=$blockTimes_id, ");
return 0;
}
-} ## end sub clear_blockComputers
+} ## end sub clear_block_computers
=pod
////////////////////////////////////////////////////////////////////////////////
Modified: vcl/trunk/managementnode/lib/VCL/healthcheck.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/healthcheck.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/healthcheck.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/healthcheck.pm Tue Dec 9 22:06:32 2014
@@ -291,7 +291,7 @@ sub process {
$node_status{status} = "ready";
next;
}
- my @currentimage_txt_contents = get_current_image_contents_noDS($computer_short_name);
+ my @currentimage_txt_contents = get_current_image_contents_no_data_structure($computer_short_name);
foreach my $l (@currentimage_txt_contents) {
#notify($ERRORS{'OK'}, 0, "NODE l=$l");
if ( $l =~ /imagerevision_id/i ) {
Modified: vcl/trunk/managementnode/lib/VCL/image.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/image.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/image.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/image.pm Tue Dec 9 22:06:32 2014
@@ -777,7 +777,7 @@ sub setup_capture_base_image {
}
if (update_computer_state($computer_id, "available")) {
print "Set $computer_node_name to available state\n";
- }
+ }
$chosen_prettyname = $existing_requests_array_choices{$chosen_request_id}{prettyname};
print "Restarting image capture for: \nRequest id= $chosen_request_id \nImage Name: $chosen_prettyname \nNode Name: $computer_node_name\n";
Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Tue Dec 9 22:06:32 2014
@@ -532,7 +532,7 @@ EOF
# Send IM
if ($user_imtype_name ne "none") {
notify($ERRORS{'DEBUG'}, 0, "user $user_login_id IM type: $user_imtype_name - notifying user of endtime");
- notify_via_IM($user_imtype_name, $user_im_id, $message);
+ notify_via_im($user_imtype_name, $user_im_id, $message);
}
else {
notify($ERRORS{'DEBUG'}, 0, "user $user_login_id IM type: $user_imtype_name - not notifying user of endtime");
@@ -670,7 +670,7 @@ EOF
# Send IM
if ($is_parent_reservation && $user_imtype_name ne "none") {
- notify_via_IM($user_imtype_name, $user_im_id, $message);
+ notify_via_im($user_imtype_name, $user_im_id, $message);
}
return 1;
@@ -738,7 +738,7 @@ EOF
# Send IM
if ($is_parent_reservation && $user_imtype_name ne "none") {
- notify_via_IM($user_imtype_name, $user_im_id, $message);
+ notify_via_im($user_imtype_name, $user_im_id, $message);
}
return 1;
@@ -842,7 +842,7 @@ EOF
# Send IM
if ($is_parent_reservation && $user_imtype_name ne "none") {
- notify_via_IM($user_imtype_name, $user_im_id, $message);
+ notify_via_im($user_imtype_name, $user_im_id, $message);
}
return 1;
@@ -905,7 +905,7 @@ EOF
notify($ERRORS{'OK'}, 0, "sent reservation timeout e-mail to $user_email");
}
if ($user_im_name ne "none") {
- notify_via_IM($user_im_name, $user_im_id, $message);
+ notify_via_im($user_im_name, $user_im_id, $message);
notify($ERRORS{'OK'}, 0, "sent reservation timeout IM to $user_im_name");
}
return 1;
Modified: vcl/trunk/managementnode/lib/VCL/new.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/new.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/new.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/new.pm Tue Dec 9 22:06:32 2014
@@ -654,7 +654,7 @@ sub reload_image {
notify($ERRORS{'DEBUG'}, 0, " SERVER_REQUEST_ID detected");
if ($server_request_fixedIP) {
notify($ERRORS{'DEBUG'}, 0, "server_request_fixedIP is set calling update_public_ip_address");
- if (!$self->os->server_request_set_fixedIP()) {
+ if (!$self->os->server_request_set_fixed_ip()) {
notify($ERRORS{'WARNING'}, 0, "failed to update IP address for $computer_short_name");
insertloadlog($reservation_id, $computer_id, "failed", "unable to set public IP address on $computer_short_name possibly IP address is inuse");
return;
@@ -1003,7 +1003,7 @@ EOF
}
if ($user_imtype_name ne "none") {
- notify_via_IM($user_imtype_name, $user_im_id, $mailstring, $user_affiliation_helpaddress);
+ notify_via_im($user_imtype_name, $user_im_id, $mailstring, $user_affiliation_helpaddress);
}
return 1;
Modified: vcl/trunk/managementnode/lib/VCL/reclaim.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reclaim.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reclaim.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reclaim.pm Tue Dec 9 22:06:32 2014
@@ -248,7 +248,7 @@ sub insert_reload_and_exit {
}
# Retrieve next image
- my ($action, $next_image_name, $next_image_id, $next_imagerevision_id) = $self->data->get_next_image_dataStructure();
+ my ($action, $next_image_name, $next_image_id, $next_imagerevision_id) = $self->data->get_next_image_data_structure();
if ($action =~ /unload/i) {
if ($self->provisioner->can("unload")) {
Modified: vcl/trunk/managementnode/lib/VCL/reserved.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reserved.pm Tue Dec 9 22:06:32 2014
@@ -320,7 +320,7 @@ EOF
notify($ERRORS{'OK'}, 0, "sent reservation timeout e-mail to $user_email");
}
if ($user_im_name ne "none") {
- notify_via_IM($user_im_name, $user_im_id, $message);
+ notify_via_im($user_im_name, $user_im_id, $message);
notify($ERRORS{'OK'}, 0, "sent reservation timeout IM to $user_im_name");
}
return 1;
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1644202&r1=1644201&r2=1644202&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Tue Dec 9 22:06:32 2014
@@ -134,7 +134,7 @@ our @EXPORT = qw(
get_connectlog_remote_ip_address_info
get_copy_speed_info_string
get_current_file_name
- get_current_image_contents_noDS
+ get_current_image_contents_no_data_structure
get_current_package_name
get_current_reservation_lastcheck
get_current_subroutine_name
@@ -202,7 +202,7 @@ our @EXPORT = qw(
nmap_port
normalize_file_path
notify
- notify_via_IM
+ notify_via_im
notify_via_oascript
parent_directory_path
populate_reservation_natport
@@ -2600,7 +2600,7 @@ EOF
=cut
-sub notify_via_IM {
+sub notify_via_im {
my ($im_type, $im_id, $im_message) = @_;
notify($ERRORS{'WARNING'}, 0, "IM type is not defined") if (!(defined($im_type)));
@@ -2680,7 +2680,7 @@ sub notify_via_IM {
}
return 1;
-} ## end sub notify_via_IM
+} ## end sub notify_via_im
#/////////////////////////////////////////////////////////////////////////////
@@ -10475,7 +10475,7 @@ sub sort_by_file_name {
#/////////////////////////////////////////////////////////////////////////////
-=head2 get_current_image_contents_noDS
+=head2 get_current_image_contents_no_data_structure
Parameters : node name
Returns : array
@@ -10483,7 +10483,7 @@ sub sort_by_file_name {
=cut
-sub get_current_image_contents_noDS {
+sub get_current_image_contents_no_data_structure {
my ($computer_node_name) = @_;