Merge pull request #536 from ancorgs/kill_legacy_api

Adapt to cleaned Y2Storage::StorageManager API
yast · Jul 26, 2017 · 3fd0725 · 3fd0725
2 parents 35c0061 + 2587d18
commit 3fd0725
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 25 10:44:32 UTC 2017 - ancor@suse.com
+
+- storage-ng: adapted calls to temporary y2storage_* methods, since
+  they were finally removed from Y2Storage::StorageManager.
+
 -------------------------------------------------------------------
 Mon Jul 10 07:06:17 UTC 2017 - gsouza@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -43,9 +43,9 @@ Requires:       yast2-xml
 
 #netconfig (FaTE #303618)
 Requires:       sysconfig >= 0.80.0
-# Needed to verify if a disk is in network
-BuildRequires:  yast2-storage-ng >= 0.1.29
-Requires:       yast2-storage-ng >= 0.1.29
+# New versions of StorageManager#probed and StorageManager#staging
+BuildRequires:  yast2-storage-ng >= 0.1.32
+Requires:       yast2-storage-ng >= 0.1.32
 # Packages::vnc_packages
 Requires:       yast2-packager >= 3.1.47
 # cfa for parsing hosts, AugeasTree#unique_id

diff --git a/src/lib/network/clients/save_network.rb b/src/lib/network/clients/save_network.rb
@@ -34,7 +34,7 @@ def main
     def adjust_for_network_disks(file)
       # storage-ng
       # Check if installation is targeted to a remote destination.
-      devicegraph = Y2Storage::StorageManager.instance.y2storage_staging
+      devicegraph = Y2Storage::StorageManager.instance.staging
       is_disk_in_network = devicegraph.filesystem_in_network?(
         Installation.destdir
       )

diff --git a/test/save_network_test.rb b/test/save_network_test.rb
@@ -10,7 +10,7 @@
     before do
       Y2Storage::StorageManager.create_test_instance
 
-      staging = Y2Storage::StorageManager.instance.y2storage_staging
+      staging = Y2Storage::StorageManager.instance.staging
       allow(staging).to receive(:filesystem_in_network?).and_return(in_network)
       allow(Yast::SCR).to receive(:Execute).and_return("exit" => 0, "stdout" => "", "stderr" => "")
     end