Merge pull request #1808 from ogayot/early-v2-orig-config

filesystem: don't crash if v2/orig_config is called early

subiquity/models/filesystem.py

@@ -1435,6 +1435,7 @@ class FilesystemModel:
         # use on the V2 storage API.
         orig_model = FilesystemModel(self.bootloader, root=self.root)
         orig_model.target = self.target
+        if self._probe_data is not None:
             orig_model.load_probe_data(self._probe_data)
         return orig_model
 

subiquity/models/tests/test_filesystem.py

@@ -328,6 +328,15 @@ class TestFilesystemModel(unittest.TestCase):
         self.assertFalse(lv.ok_for_raid)
         self.assertFalse(lv.ok_for_lvm_vg)
 
+    def test_get_orig_model_no_probe_data(self):
+        # When v2/get_orig_data gets called early, model._probe_data is still
+        # None. Ensure get_orig_model() does not fail.
+        model = make_model()
+
+        model._probe_data = None
+        orig_model = model.get_orig_model()
+        self.assertIsNone(orig_model._probe_data)
+
 
 def fake_up_blockdata_disk(disk, **kw):
     model = disk._m