raw.py: kill get_diskinfo()

We do not need this function anymore. The only thing we need is to get disk
names. So instead, introduce a 'get_disk_names()' method which simply returns a
list of disk names.

This is a clean-up.

Change-Id: I5145ab0fe3f36c9ac5fef6bb82b53a29f51eb5b0
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>

diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 9ce21d5..c8706e8 100644 (file)
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -48,7 +48,7 @@ class RawImageCreator(BaseImageCreator):
         self.__imgdir = None
         self.__disks = {}
         self.__disk_format = "raw"
-        self._diskinfo = []
+        self._disk_names = []
         self.vmem = 512
         self.vcpu = 1
         self.checksum = False
@@ -141,17 +141,19 @@ class RawImageCreator(BaseImageCreator):
         # partitions list from kickstart file
         return kickstart.get_partitions(self.ks)
 
-    def get_diskinfo(self):
+    def get_disk_names(self):
+        """ Returns a list of physical target disk names (e.g., 'sdb') which
+        will be created. """
 
-        if self._diskinfo:
-            return self._diskinfo
+        if self._disk_names:
+            return self._disk_names
 
         #get partition info from ks handler
         parts = self._get_parts()
 
         for i in range(len(parts)):
             if parts[i].disk:
-                disk = parts[i].disk
+                disk_name = parts[i].disk
             else:
                 raise CreatorError("Failed to create disks, no --ondisk "
                                    "specified in partition line of ks file")
@@ -160,26 +162,9 @@ class RawImageCreator(BaseImageCreator):
                  raise CreatorError("Failed to create disks, no --fstype "
                                     "specified in partition line of ks file")
 
-            size =   parts[i].size * 1024L * 1024L
+            self._disk_names.append(disk_name)
 
-            # If we have alignment set for partition we need to enlarge the
-            # drive, so that the alignment changes fits there as well
-            if parts[i].align:
-                size += parts[i].align * 1024L
-
-            found = False
-            for j in range(len(self._diskinfo)):
-                if self._diskinfo[j]['name'] == disk:
-                    self._diskinfo[j]['size'] = self._diskinfo[j]['size'] + size
-                    found = True
-                    break
-                else:
-                    found = False
-
-            if not found:
-                self._diskinfo.append({ 'name': disk, 'size': size })
-
-        return self._diskinfo
+        return self._disk_names
 
     def _full_name(self, name, extention):
         """ Construct full file name for a file we generate. """

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 3bd76d9..8b7a3e5 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -100,8 +100,8 @@ class RawPlugin(ImagerPlugin):
         if len(recording_pkgs) > 0:
             creator._recording_pkgs = recording_pkgs
 
-        images = ["%s-%s.raw" % (creator.name, part['name'])
-                  for part in creator.get_diskinfo()]
+        images = ["%s-%s.raw" % (creator.name, disk_name)
+                  for disk_name in creator.get_disk_names()]
         self.check_image_exists(creator.destdir,
                                 creator.pack_to,
                                 images,