the msf function that was missing

1 files changed, 28 insertions, 18 deletions

diff --git a/partitioning.py b/partitioning.py
index e24893bd9..bec325a0a 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -1050,24 +1050,6 @@ class Partitions:
 
         return retval
 
-    def getLVMRequests(self):
-        retval = {}
-        for request in self.requests:
-            if request.type == REQUEST_VG:
-                if request.volumeGroupName not in retval.keys():
-                    retval[request.volumeGroupName] = []
-            elif request.type == REQUEST_LV:
-                vg = self.getRequestByID(request.volumeGroup)
-                if not vg:
-                    raise RuntimeError, "Have a logical volume without a volume group"
-                vgname = vg.volumeGroupName
-                if vgname in retval.keys():
-                    retval[vgname].append(request)
-                else:
-                    retval[vgname] = [ request ] 
-
-        return retval
-
     def isRaidMember(self, request):
         raiddev = self.getRaidRequests()
         if not raiddev or not request.device:
@@ -1080,6 +1062,34 @@ class Partitions:
                     return 1
         return 0
 
+    # LVM helpers
+    def getLVForPV(self, pvrequest):
+	retval = []
+	pvid = pvrequest.uniqueID
+	for request in self.requests:
+	    if request.type == REQUEST_LV:
+		print "in getLVForPV:", request
+		if request.volumeGroup == pvid:
+		    retval.append(request)
+
+	return retval
+		
+    def getLVMRequests(self):
+        retval = {}
+        for request in self.requests:
+            if request.type == REQUEST_VG:
+                retval[request.volumeGroupName] = self.getLVForPV(request)
+	    
+        return retval
+
+    def getLVMLVRequests(self):
+        retval = []
+        for request in self.requests:
+            if request.type == REQUEST_LV:
+                retval.append(request)
+
+        return retval
+
     # return name of boot mount point in current requests
     def getBootableRequest(self):
         bootreq = None