X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Ftest.pl;fp=clearadm%2Ftest.pl;h=f76dfdd2f9685427e37f3a9924072c77040b11a2;hb=3c28a301742e8f8cdd35825fd6ebe4f842a510c7;hp=3447284a1ef4cc8cab26de9166f02d7cead5095c;hpb=cc7bfce480ad76a92d6c9e8c8bcb59295e099388;p=clearscm.git

diff --git a/clearadm/test.pl b/clearadm/test.pl
index 3447284..f76dfdd 100755
--- a/clearadm/test.pl
+++ b/clearadm/test.pl
@@ -15,27 +15,27 @@ use Utils;
 my $clearadm = new Clearadm;
 
 my %system = (
-  name			=> 'jupiter',
-  alias			=> 'defaria.com',
-  admin			=> 'Andrew DeFaria',
-  os			=> 'Linux defaria.com 2.6.32-25-generic-pae #45-Ubuntu SMP Sat Oct 16 21:01:33 UTC 2010 i686 GNU/Linux',
-  type			=> 'Linux',
+  name		=> 'jupiter',
+  alias		=> 'defaria.com',
+  admin		=> 'Andrew DeFaria',
+  os		=> 'Linux defaria.com 2.6.32-25-generic-pae #45-Ubuntu SMP Sat Oct 16 21:01:33 UTC 2010 i686 GNU/Linux',
+  type		=> 'Linux',
   description	=> 'Home server',
 );
 
 my %package = (
-  'system'		=> 'jupiter',
-  'name'		=> 'MySQL',
-  'version'		=> '5.1',
+  'system'	=> 'jupiter',
+  'name'	=> 'MySQL',
+  'version'	=> '5.1',
 );
 
 my %update;
 
 my %filesystem = (
-  'system'		=> 'jupiter',
+  'system'	=> 'jupiter',
   'filesystem'	=> '/dev/mapper/jupiter-root',
-  'fstype'		=> 'ext3',
-  'mount'		=> '/',
+  'fstype'	=> 'ext3',
+  'mount'	=> '/',
   'threshold'	=> 90,
 );
 
@@ -57,26 +57,25 @@ GetOptions (
 sub DisplayRecord (%) {
   my (%record) = @_;
   
-  foreach (keys %record) {
-  	if ($record{$_}) {
-  	  display "$_: $record{$_}";
-  	} else {
-  	  display "$_: <undef>";
-  	} # if
-  } # foreach
+  for (keys %record) {
+    if ($record{$_}) {
+      display "$_: $record{$_}";
+    } else {
+      display "$_: <undef>";
+    } # if
+  } # for
 } # DisplayRecord
 
-sub DisplayRecords (@) {
+sub DisplayRecords(@) {
   my (@records) = @_;
   
-  DisplayRecord %{$_}
-    foreach (@records);
+  DisplayRecord %{$_} for (@records);
 } # DisplayRecords
 
-sub TestSystem () {
+sub TestSystem() {
   verbose "Adding system $system{name}";
 
-  my ($err, $msg) = $clearadm->AddSystem (%system);
+  my ($err, $msg) = $clearadm->AddSystem(%system);
 
   if ($err == 1062) {
     warning 'You already have that record!';
@@ -85,16 +84,16 @@ sub TestSystem () {
   } # if
 
   verbose "Finding systems that match \'jup\'";
-  DisplayRecords $clearadm->FindSystem ('jup');
+  DisplayRecords $clearadm->FindSystem('jup');
 
   verbose "Getting record for \'jupiter\'";
-  DisplayRecord  $clearadm->GetSystem ('jupiter');
+  DisplayRecord  $clearadm->GetSystem('jupiter');
 
   verbose "Finding systems that match \'def\'";
-  DisplayRecords $clearadm->FindSystem ('def');
+  DisplayRecords $clearadm->FindSystem('def');
   
   verbose "Getting record for \'defaria.com\'";
-  DisplayRecord $clearadm->GetSystem ('defaria.com');
+  DisplayRecord $clearadm->GetSystem('defaria.com');
   
   %update = (
     'region' => 'East Coast',
@@ -102,16 +101,15 @@ sub TestSystem () {
 
   verbose "Updating system $system{name}";
 
-  ($err, $msg) = $clearadm->UpdateSystem ($system{name}, %update);
+  ($err, $msg) = $clearadm->UpdateSystem($system{name}, %update);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 } # TestaSystem
 
-sub TestPackage () {
+sub TestPackage() {
   verbose "Adding package $package{name}";
   
-  my ($err, $msg) = $clearadm->AddPackage (%package);
+  my ($err, $msg) = $clearadm->AddPackage(%package);
 
   if ($err == 1062) {
     warning 'You already have that record!';
@@ -120,108 +118,100 @@ sub TestPackage () {
   } # if
 
   %update = (
-    'vendor'		=> 'ClearSCM',
-    'description'	=> 'This is not ClearSCM\'s version of MySQL', 
+    'vendor'	  => 'ClearSCM',
+    'description' => 'This is not ClearSCM\'s version of MySQL', 
   );
 
   verbose "Updating package $package{name}";
   
-  ($err, $msg) = $clearadm->UpdatePackage ($package{system}, $package{name}, %update);
+  ($err, $msg) = $clearadm->UpdatePackage($package{system}, $package{name}, %update);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   verbose "Finding packages for $system{name} that match \'My\'";
-  DisplayRecords $clearadm->FindPackage ($system{name}, 'My');
+  DisplayRecords $clearadm->FindPackage($system{name}, 'My');
 
   verbose ("Getting package for $system{name} record for \'MySQL\'");
-  DisplayRecord  $clearadm->GetPackage  ($system{name}, 'MySQL');
+  DisplayRecord  $clearadm->GetPackage($system{name}, 'MySQL');
 } # TestPackage
 
-sub TestFilesystem () {
+sub TestFilesystem() {
   verbose "Adding filesystem $filesystem{filesystem}";
   
-  my ($err, $msg) = $clearadm->AddFilesystem (%filesystem);
+  my ($err, $msg) = $clearadm->AddFilesystem(%filesystem);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
   
-  $filesystem{filesystem}	= '/dev/sda5';
-  $filesystem{path}			= '/disk2';
+  $filesystem{filesystem} = '/dev/sda5';
+  $filesystem{path}	  = '/disk2';
 
   verbose "Adding filesystem $filesystem{filesystem}";
   
-  ($err, $msg) = $clearadm->AddFilesystem (%filesystem);
+  ($err, $msg) = $clearadm->AddFilesystem(%filesystem);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   %update = (
-    'filesystem'	=> '/dev/sdb5',
+    'filesystem' => '/dev/sdb5',
   );
 
   verbose "Updating filesystem $filesystem{filesystem}";
   
-  ($err, $msg) = $clearadm->UpdateFilesystem (
+  ($err, $msg) = $clearadm->UpdateFilesystem(
     $filesystem{system}, $filesystem{filesystem}, %update
   );
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   verbose "Finding filesystems for $system{name} that match \'My\'";
-  DisplayRecords $clearadm->FindFilesystem ($system{name}, 'root');
+  DisplayRecords $clearadm->FindFilesystem($system{name}, 'root');
 
   verbose ("Getting filesystem for $system{name} record for \'/dev/sdb5\'");
-  DisplayRecord  $clearadm->GetFilesystem ($system{name}, '/dev/sdb5');
+  DisplayRecord  $clearadm->GetFilesystem($system{name}, '/dev/sdb5');
 } # TestFilesystem
 
-sub TestVob () {
+sub TestVob() {
   verbose "Adding vob $vob{tag}";
 
-  my ($err, $msg) = $clearadm->AddVob (%vob);
+  my ($err, $msg) = $clearadm->AddVob(%vob);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
   
   $vob{tag} = '/vobs/clearscm_old';
 
   verbose "Adding vob $vob{tag}";
 
-  ($err, $msg) = $clearadm->AddVob (%vob);
+  ($err, $msg) = $clearadm->AddVob(%vob);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   verbose "Finding vobs that match \'clearscm\'";
-  DisplayRecords $clearadm->FindVob ('clearscm');
+  DisplayRecords $clearadm->FindVob('clearscm');
 
   verbose ("Getting vob for \'clearscm\'");
-  DisplayRecord  $clearadm->GetVob ('clearscm');
+  DisplayRecord  $clearadm->GetVob('clearscm');
 } # TestVob
 
-sub TestView () {
+sub TestView() {
   verbose "Adding view $view{tag}";
 
-  my ($err, $msg) = $clearadm->AddView (%view);
+  my ($err, $msg) = $clearadm->AddView(%view);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   $view{tag} = 'andrew2_view';
 
   verbose "Adding view $view{tag}";
 
-  ($err, $msg) = $clearadm->AddView (%view);
+  ($err, $msg) = $clearadm->AddView(%view);
 
-  error $msg, $err
-    if $err;
+  error $msg, $err if $err;
 
   verbose "Finding views that match \'andrew\'";
-  DisplayRecords $clearadm->FindView ('andrew');
+  DisplayRecords $clearadm->FindView('andrew');
 
   verbose ("Getting view for \'view\'");
-  DisplayRecord  $clearadm->GetView ('andrew');
+  DisplayRecord  $clearadm->GetView('andrew');
 } # TestView
 
 TestSystem;
@@ -233,8 +223,6 @@ TestView;
 ########################
 verbose "Deleting system $system{name}";
   
-my ($err, $msg) = $clearadm->DeleteSystem ($system{name});
+my ($err, $msg) = $clearadm->DeleteSystem($system{name});
 
-error $msg, $err
-  if $err;
-   
+error $msg, $err if $err;