Use the filesystem from the object cache when unmounting / mounting (#…

…1978)

filesystems.

Signed-off-by: johnsonw <wjohnson@whamcloud.com>

chroma_core/models/client_mount.py

@@ -293,7 +293,17 @@ def description(self):
  def get_steps(self):
  search = lambda cm: (cm.host == self.host and cm.state == "unmounted")
  unmounted = ObjectCache.get(LustreClientMount, search)
- args = dict(host=self.host, filesystems=[(m.filesystem.mount_path(), m.mountpoint) for m in unmounted])
+ args = {
+ "host": self.host,
+ "filesystems": [
+ (
+ ObjectCache.get_one(ManagedFilesystem, lambda mf, mtd=m: mf.name == mtd.filesystem).mount_path(),
+ m.mountpoint,
+ )
+ for m in unmounted
+ ],
+ }
+
  return [(MountLustreFilesystemsStep, args)]
 
 
@@ -353,5 +363,15 @@ def description(self):
  def get_steps(self):
  search = lambda cm: (cm.host == self.host and cm.state == "mounted")
  mounted = ObjectCache.get(LustreClientMount, search)
- args = dict(host=self.host, filesystems=[(m.filesystem.mount_path(), m.mountpoint) for m in mounted])
+ args = {
+ "host": self.host,
+ "filesystems": [
+ (
+ ObjectCache.get_one(ManagedFilesystem, lambda mf, mtd=m: mf.name == mtd.filesystem).mount_path(),
+ m.mountpoint,
+ )
+ for m in mounted
+ ],
+ }
+
  return [(UnmountLustreFilesystemsStep, args)]