Merge branch 'resolved' into develop

Author: Marcin Przepiorowski

bin/dx_get_osversions.pl

@@ -45,6 +45,7 @@
   'help|?' => \(my $help),
   'd|engine=s' => \(my $dx_host),
   'format=s' => \(my $format),
+  'steps' => \(my $steps),
   'report' => \(my $report),
   'target=s' => \(my $target),
   'debug:i' => \(my $debug),
@@ -68,9 +69,15 @@
 }
 
 
+if (defined($steps) && defined($report)) {
+   print "Options -report and -steps are mutually exclusive \n";
+   pod2usage(-verbose => 1,  -input=>\*DATA);
+   exit (1);
+}
+
 my $output = new Formater();
 
-if (defined($report)) {
+if (defined($steps)) {
   $output->addHeader(
       {'engine name',          35},
       {'from',                 15},
@@ -80,6 +87,14 @@
       {'severity',             15},
       {'Start test date',      30}
   );
+} elsif (defined($report)) {
+  $output->addHeader(
+      {'engine name',          35},
+      {'to',                   15},
+      {'title',                30},
+      {'status',               15},
+      {'severity',             15}
+  );
 } else {
   $output->addHeader(
       {'engine name',          35},
@@ -110,7 +125,7 @@
 
 
   my $version_obj = new Version_obj($engine_obj, $debug);
-  if (defined($report)) {
+  if (defined($steps)) {
     $version_obj->loadVerfication();
 
     for my $repref (@{$version_obj->getReportList()}) {
@@ -135,6 +150,30 @@
         );
         $version_obj->getReportSteps($repref, $output);
     }
+  } elsif ( defined($report) ) {
+    $version_obj->loadVerfication();
+
+    for my $oshash (@{$version_obj->getOSversions()}) {
+      my $tover = $version_obj->getOSName($oshash);
+      if (defined($target))  {
+        if ($target ne $tover) {
+          $ret = 1;
+          next;
+        } else {
+          # target found
+          $ret = 0;
+        }
+      } 
+      $output->addLine(
+          $engine,
+          $tover,
+          '',
+          '',
+          ''
+      );
+      $version_obj->loadUpgradeReport($oshash);
+      $version_obj->getReportResults($oshash, $output)
+    }
 
   } else {
     for my $oshash (@{$version_obj->getOSversions()}) {

lib/Version_obj.pm

@@ -41,11 +41,13 @@ sub new {
     my %versions;
     my %osmap;
     my %verification;
+    my %reports;
     my $self = {
         _versions => \%versions,
         _name_map => \%osmap,
         _verification => \%verification,
         _dlpxObject => $dlpxObject,
+        _reports => \%reports,
         _debug => $debug
     };
 
@@ -79,6 +81,29 @@ sub loadOSversions {
 
 }
 
+
+# Procedure loadUpgradeReport
+# parameters:
+# - oshash - reference to OS
+# Load upgrade checks
+
+sub loadUpgradeReport {
+   my $self = shift;
+   my $oshash = shift;
+
+   logger($self->{_debug}, "Entering Version_obj::loadUpgradeReport",1);
+   my $operation = "resources/json/delphix/system/version/" . $oshash . "/listUpgradeCheckResults";
+   my ($result,$result_fmt, $retcode) = $self->{_dlpxObject}->getJSONResult($operation);
+   if (defined($result->{status}) && ($result->{status} eq 'OK')) {
+      $self->{_reports}->{$oshash} = $result->{"result"};
+   } else {
+       print "No data returned for $operation. Try to increase timeout \n";
+   }
+}
+
+
+
+
 # Procedure getOSversions
 # parameters:
 # Return list of loaded
@@ -219,6 +244,24 @@ sub getReportVersions {
 
 }
 
+sub getReportResults {
+   my $self = shift;
+   my $oshash = shift;
+   my $output = shift;
+
+   for my $entry (@{$self->{_reports}->{$oshash}}) {
+       $output->addLine(
+         '',
+         '',
+         $entry->{title},
+         $entry->{status},
+         $entry->{severity}
+       );
+
+   }
+
+}
+
 
 sub getReportSteps {
    my $self = shift;