Include system information in the SystemChanged signal

Author: ancorgs

service/lib/agama/dbus/storage/manager.rb

@@ -78,7 +78,7 @@ def initialize(backend, logger: nil)
           dbus_method(:SolveConfigModel, "in model:s, out result:s") { |m| solve_config_model(m) }
           dbus_method(:GetProposal, "out proposal:s") { recover_proposal }
           dbus_method(:GetIssues, "out issues:s") { recover_issues }
-          dbus_signal(:SystemChanged)
+          dbus_signal(:SystemChanged, "system:s")
           dbus_signal(:ProposalChanged)
           dbus_signal(:IssuesChanged)
           dbus_signal(:ProgressChanged, "progress:s")
@@ -93,7 +93,7 @@ def activate
 
           next_progress_step(PROBING_STEP)
           backend.probe
-          self.SystemChanged
+          emit_system_changed
 
           next_progress_step(CONFIGURING_STEP)
           configure_with_current
@@ -108,7 +108,7 @@ def probe
 
           next_progress_step(PROBING_STEP)
           backend.probe
-          self.SystemChanged
+          emit_system_changed
 
           next_progress_step(CONFIGURING_STEP)
           configure_with_current
@@ -126,7 +126,7 @@ def configure_product(id)
           next_progress_step(PROBING_STEP)
           if !backend.probed?
             backend.probe
-            self.SystemChanged
+            emit_system_changed
           end
 
           next_progress_step(CONFIGURING_STEP)
@@ -510,6 +510,11 @@ def volume_templates
           end
         end
 
+        # Emits the SystemChanged signal
+        def emit_system_changed
+          self.SystemChanged(recover_system)
+        end
+
         def add_s390_interfaces
           require "agama/dbus/storage/interfaces/dasd_manager"
           require "agama/dbus/storage/interfaces/zfcp_manager"

service/test/agama/dbus/storage/manager_test.rb

@@ -789,6 +789,104 @@ def parse(string)
     end
   end
 
+  describe "#probe" do
+    before do
+      allow(subject).to receive(:SystemChanged)
+      allow(subject).to receive(:ProgressChanged)
+      allow(subject).to receive(:ProgressFinished)
+
+      allow(backend).to receive(:activated?).and_return activated
+      allow(backend).to receive(:probe)
+    end
+
+    let(:activated) { true }
+
+    it "triggers a new probing" do
+      expect(backend).to receive(:probe)
+      subject.probe
+    end
+
+    context "when storage devices are already activated" do
+      it "does not activate devices" do
+        expect(backend).to_not receive(:activate)
+        subject.probe
+      end
+    end
+
+    context "when storage devices are not yet activated" do
+      let(:activated) { false }
+
+      it "activates the devices" do
+        expect(backend).to receive(:activate)
+        subject.probe
+      end
+    end
+
+    context "when no storage configuration has been set" do
+      it "does not calculate a new proposal" do
+        expect(backend).to_not receive(:configure)
+        subject.probe
+      end
+
+      it "does not emit a ProposalChanged signal" do
+        expect(subject).to_not receive(:ProposalChanged)
+        subject.probe
+      end
+
+      it "emits signals for SystemChanged, ProgressChanged and ProgressFinished" do
+        expect(subject).to receive(:SystemChanged) do |system_str|
+          system = parse(system_str)
+          device = system[:devices].first
+          expect(device[:name]).to eq "/dev/sda"
+          expect(system[:availableDrives]).to eq [device[:sid]]
+        end
+        expect(subject).to receive(:ProgressChanged).with(/storage configuration/i)
+        expect(subject).to receive(:ProgressFinished)
+
+        subject.probe
+      end
+    end
+
+    context "when a storage configuration was previously set" do
+      before do
+        allow(proposal).to receive(:storage_json).and_return config_json.to_json
+        allow(subject).to receive(:ProposalChanged)
+        allow(backend).to receive(:configure)
+      end
+
+      let(:config_json) do
+        {
+          storage: {
+            drives: [
+              {
+                partitions: [{ generate: "defaults" }]
+              }
+            ]
+          }
+        }
+      end
+
+      it "re-calculates the proposal" do
+        expect(backend).to receive(:configure).with(config_json)
+        subject.probe
+      end
+
+      it "emits signals for ProposalChanged, SystemChanged, ProgressChanged and ProgressFinished" do
+        expect(subject).to receive(:SystemChanged) do |system_str|
+          system = parse(system_str)
+          device = system[:devices].first
+          expect(device[:name]).to eq "/dev/sda"
+          expect(system[:availableDrives]).to eq [device[:sid]]
+        end
+        expect(subject).to receive(:ProposalChanged)
+        expect(subject).to receive(:ProgressChanged).with(/storage configuration/i)
+        expect(subject).to receive(:ProgressFinished)
+
+        subject.probe
+      end
+    end
+  end
+
   describe "#recover_issues" do
     context "if no proposal has been calculated" do
       it "returns an empty array" do