[et-mgmt-tools] [PATCH 4 of 5] Rename Boot.disks to Boot.drives

[David Lutterkort]

# HG changeset patch
# User David Lutterkort <dlutter at redhat.com>
# Date 1197512462 28800
# Node ID da46770a461b6299c409522d82eec58d45e29bf1
# Parent  eb8ba74062f4d4f1fcf13578860d049d3e6e4611
Rename Boot.disks to Boot.drives

In the XML, the corresponding element is called 'drive', not 'disk'

diff -r eb8ba74062f4 -r da46770a461b virtinst/ImageManager.py
--- a/virtinst/ImageManager.py	Wed Dec 12 18:21:02 2007 -0800
+++ b/virtinst/ImageManager.py	Wed Dec 12 18:21:02 2007 -0800
@@ -70,7 +70,7 @@ class ImageInstaller(Guest.Installer):
                     guest.features[f] = False
 
     def _make_disks(self, guest):
-        for m in self.boot.disks:
+        for m in self.boot.drives:
             p = self._abspath(m.disk.file)
             s = None
             if m.disk.size is not None:
diff -r eb8ba74062f4 -r da46770a461b virtinst/ImageParser.py
--- a/virtinst/ImageParser.py	Wed Dec 12 18:21:02 2007 -0800
+++ b/virtinst/ImageParser.py	Wed Dec 12 18:21:02 2007 -0800
@@ -76,7 +76,7 @@ class Image:
             raise ParserException(_("Expected exactly one 'domain' element"))
         # Connect the disk maps to the disk definitions
         for boot in self.domain.boots:
-            for d in boot.disks:
+            for d in boot.drives:
                 if not self.storage.has_key(d.disk_id):
                     raise ParserException(_("Disk entry for '%s' not found")
                                                % d.disk_id)
@@ -135,7 +135,7 @@ class Boot:
         self.kernel = None
         self.initrd = None
         self.cmdline = None
-        self.disks = []
+        self.drives = []
         self.arch = None
         self.features = ImageFeatures()
         if not node is None:
@@ -157,7 +157,7 @@ class Boot:
             self.features = ImageFeatures(fl[0])
 
         for d in node.xpathEval("drive"):
-            self.disks.append(Drive(d))
+            self.drives.append(Drive(d))
 
         validate(self.type is not None,
            "The boot type must be provided")