Merge branch 'report_add_serverity' into develop

Author: Marcin Przepiorowski

bin/dx_get_appliance.pl

@@ -85,7 +85,8 @@
     {'Total Objects', 8},
     {'vCpu',  8},
     {'vMem [GB]',  9},
-    {'UUID',40}
+    {'UUID',40},
+    {'Type',20}
   );
 } else {
   $output->addHeader(
@@ -124,6 +125,7 @@
         "",
         "",
         "",
+        "",
         ""
       );
     } else {
@@ -169,7 +171,8 @@
       scalar(@dsource) +  scalar(@vdb),
       $system->getvCPU(),
       sprintf("%8.2f",$system->getvMem()),
-      $system->getUUID()
+      $system->getUUID(),
+      $system->getEngineType()
     );
   } else {
     $output->addLine(

bin/dx_get_osversions.pl

@@ -77,6 +77,7 @@
       {'to',                   15},
       {'step',                 30},
       {'status',               15},
+      {'severity',             15},
       {'Start test date',      30}
   );
 } else {
@@ -129,6 +130,7 @@
             $verified_version,
             '',
             '',
+            '',
             ''
         );
         $version_obj->getReportSteps($repref, $output);

lib/System_obj.pm

@@ -567,6 +567,17 @@ sub getLDAPServers
     return \@retarray;
 }
 
+# Procedure getEngineType
+# parameters: none
+# return a engine type - masking / virtualization
+
+sub getEngineType
+{
+   my $self = shift;
+   logger($self->{_debug}, "Entering System_obj::getEngineType",1);
+   my $vMem = $self->{_system}->{engineType};
+   return $vMem;
+}
 
 
 1;

lib/Toolkit_helpers.pm

@@ -29,7 +29,7 @@ use File::Spec;
 
 use lib '../lib';
 
-our $version = '2.4.16.1';
+our $version = '2.4.16.2';
 
 my $tz = new Date::Manip::TZ;
 my $dt = new Date::Manip::Date;

lib/Version_obj.pm

@@ -229,14 +229,22 @@ sub getReportSteps {
      my $report_dict = $self->{_verification}->{$reportref}->{report};
      my @ordered_by_date = sort { $a->{startTimestamp} cmp $b->{startTimestamp} } @{$report_dict->{checkReport}};
      my $start_time;
+     my $severity;
      for my $step (@ordered_by_date) {
+       if (scalar(@{$step->{notifications}}) > 0) {
+         $severity = (@{$step->{notifications}}[-1])->{severity};
+       } else {
+         $severity = "";
+       }
+
        $start_time = Toolkit_helpers::convert_from_utc ($step->{startTimestamp}, $self->{_dlpxObject}->getTimezone(), 1);
        $output->addLine(
          '',
          '',
          '',
          $step->{className},
          $step->{runStatus},
+         $severity,
          $start_time
        )
      };