# HG changeset patch
# User swati sarraf <swati.sarraf@oracle.com>
# Date 1342826357 25200
# Node ID 5c51d42f1aaf820dbdfa089ed3bbbed8c655184b
# Parent  c2d3505859c8498596fa1cac2e0656e8a66d491f
7163694 Interactive installer's display of min/rec install device size display should be rounded up

diff -r c2d3505859c8 -r 5c51d42f1aaf usr/src/cmd/gui-install/src/disk_screen.py
--- a/usr/src/cmd/gui-install/src/disk_screen.py	Tue Jul 17 12:52:20 2012 -0700
+++ b/usr/src/cmd/gui-install/src/disk_screen.py	Fri Jul 20 16:19:17 2012 -0700
@@ -39,6 +39,7 @@
 
 import osol_install.errsvc as errsvc
 import osol_install.liberrsvc as liberrsvc
+from math import ceil 
 from solaris_install.data_object import ObjectNotFoundError
 from solaris_install.engine import InstallEngine
 from solaris_install.gui_install.base_screen import BaseScreen, \
@@ -703,12 +704,16 @@
             # Blank out the size values until they are available
             size_str = size_str.replace('%s', '')
         else:
-            rec_size = locale.format('%.1f',
+            rec_orig = \
                 self._target_controller.recommended_target_size.get(
-                    units=Size.gb_units))
-            min_size = locale.format('%.1f',
+                    units=Size.gb_units)
+            rec_roundup = (ceil(rec_orig * 10)) * 0.1 
+            rec_size = locale.format('%.1f', rec_roundup)
+            min_orig = \
                 self._target_controller.minimum_target_size.get(
-                    units=Size.gb_units))
+                    units=Size.gb_units)
+            min_roundup = (ceil(min_orig * 10)) * 0.1 
+            min_size = locale.format('%.1f', min_roundup)
             size_str = size_str % (rec_size, min_size)
 
         self.set_titles(_("Disk Selection"),
diff -r c2d3505859c8 -r 5c51d42f1aaf usr/src/cmd/text-install/disk_selection.py
--- a/usr/src/cmd/text-install/disk_selection.py	Tue Jul 17 12:52:20 2012 -0700
+++ b/usr/src/cmd/text-install/disk_selection.py	Fri Jul 20 16:19:17 2012 -0700
@@ -35,6 +35,7 @@
 import osol_install.liberrsvc as liberrsvc
 
 from bootmgmt.bootinfo import SystemFirmware
+from math import ceil 
 from solaris_install.text_install import _, RELEASE, TUI_HELP, \
     TARGET_DISCOVERY, TRANSFER_PREP, LOCALIZED_GB, ISCSI_LABEL, \
     ISCSI_TARGET_DISCOVERY
@@ -195,10 +196,19 @@
         '''Returns the line of text displaying the min/recommended sizes'''
 
         if self._size_line is None:
+
+            rec_orig = self.recommended_size.get(Size.gb_units) 
+            rec_roundup = (ceil(rec_orig * 10)) * 0.1 
+
             rec_size_str = locale.format("%.1f",
-                self.recommended_size.get(Size.gb_units)) + LOCALIZED_GB
+                rec_roundup) + LOCALIZED_GB
+
+            min_orig = self.minimum_size.get(Size.gb_units) 
+            min_roundup = (ceil(min_orig * 10)) * 0.1 
+
             min_size_str = locale.format("%.1f",
-                self.minimum_size.get(Size.gb_units)) + LOCALIZED_GB
+                min_roundup) + LOCALIZED_GB
+
             self._size_line = DiskScreen.MIN_SIZE_TEXT + min_size_str + \
                 "    " + DiskScreen.REC_SIZE_TEXT + rec_size_str