DONTMERGE: Unmerged code required for the c-storage integration in the anaconda-webui (multiple PRs)

pyanaconda/modules/storage/devicetree/model.py

@@ -241,7 +241,7 @@ def is_supported(disk):
 
         return list(filter(is_supported, disks))
 
-    def reset(self, cleanup_only=False):
+    def reset(self, cleanup_only=False, deep=True):
         """ Reset storage configuration to reflect actual system state.
 
             This will cancel any queued actions and rescan from scratch but not
@@ -250,9 +250,16 @@ def reset(self, cleanup_only=False):
             :keyword cleanup_only: prepare the tree only to deactivate devices
             :type cleanup_only: bool
 
+            :keyward deep: perform a deep scan and re-read existing installations
+
             See :meth:`devicetree.Devicetree.populate` for more information
             about the cleanup_only keyword argument.
         """
+        if deep:
+            log.debug("resetting storage configuration deep")
+        else:
+            log.debug("resetting storage configuration plain")
+
         # set up the disk images
         if conf.target.is_image:
             self.setup_disk_images()
@@ -266,15 +273,17 @@ def reset(self, cleanup_only=False):
 
         # Protect devices from teardown.
         self._mark_protected_devices()
-        self.devicetree.teardown_all()
+        if deep:
+            self.devicetree.teardown_all()
 
         self.fsset = FSSet(self.devicetree)
 
         # Clear out attributes that refer to devices that are no longer in the tree.
         self.bootloader.reset()
 
         self.roots = []
-        self.roots = find_existing_installations(self.devicetree)
+        if deep:
+            self.roots = find_existing_installations(self.devicetree)
         self.dump_state("initial")
 
     def _mark_protected_devices(self):

pyanaconda/modules/storage/reset.py

@@ -42,13 +42,14 @@ class ScanDevicesTask(Task):
     This task will reset the given instance of Blivet.
     """
 
-    def __init__(self, storage):
+    def __init__(self, storage, deep):
         """Create a new task.
 
         :param storage: an instance of Blivet
         """
         super().__init__()
         self._storage = storage
+        self._deep = deep
 
     @property
     def name(self):
@@ -81,4 +82,4 @@ def _reload_modules(self):
 
     def _reset_storage(self, storage):
         """Reset the storage."""
-        storage.reset()
+        storage.reset(False, self._deep)

pyanaconda/modules/storage/storage.py

@@ -229,14 +229,19 @@ def on_protected_devices_changed(self, protected_devices):
 
         self.storage.protect_devices(protected_devices)
 
-    def scan_devices_with_task(self):
+    def scan_devices_with_task(self, deep_scan: bool = True):
         """Scan all devices with a task.
 
         We will reset a copy of the current storage model
         and switch the models if the reset is successful.
 
         :return: a task
         """
+        if not deep_scan:
+            log.debug("Scanning devices without unmounting and deactivating.")
+        else:
+            log.debug("Scanning devices with unmounting and deactivating.")
+
         # Copy the storage.
         storage = self.storage.copy()
 
@@ -247,7 +252,7 @@ def scan_devices_with_task(self):
         storage.disk_images = self._disk_selection_module.disk_images
 
         # Create the task.
-        task = ScanDevicesTask(storage)
+        task = ScanDevicesTask(storage, deep_scan)
         task.succeeded_signal.connect(lambda: self._set_storage(storage))
         return task
 

pyanaconda/modules/storage/storage_interface.py

@@ -40,7 +40,7 @@ def connect_signals(self):
             "AppliedPartitioning", self.implementation.applied_partitioning_changed
         )
 
-    def ScanDevicesWithTask(self) -> ObjPath:
+    def ScanDevicesWithTask(self, deep_scan: bool = True) -> ObjPath:
         """Scan all devices with a task.
 
         Create a model of the current storage. This model will be used
@@ -50,7 +50,7 @@ def ScanDevicesWithTask(self) -> ObjPath:
         :return: a path to a task
         """
         return TaskContainer.to_object_path(
-            self.implementation.scan_devices_with_task()
+            self.implementation.scan_devices_with_task(deep_scan)
         )
 
     @emits_properties_changed

pyanaconda/ui/lib/storage.py

@@ -91,7 +91,7 @@ def reset_storage(scan_all=False, retry=True):
 
     while True:
         try:
-            task_path = storage_proxy.ScanDevicesWithTask()
+            task_path = storage_proxy.ScanDevicesWithTask(True)
             task_proxy = STORAGE.get_proxy(task_path)
             sync_run_task(task_proxy)
         except DBusError as e: