Control all devs by NM by default + filtering (iSCSI, FCoE) (#606745)

* All devices are set to NM_CONTROLLED in Network.__init__.
  This solves the issue that for media installs without network
  devices were not controlled by NM and thus not configurable
  with nm-applet after install (the bug).

* For devices used for FCoE and iSCSI NM_CONTROLLED is modified
  later (after storage initialization and FCoE/iSCSI setting)
  in two places:

  - before running nm-c-e
    - FCoE devices are set to not controlled

  - before writing ifcfg files to installed system
    - FCoE devices are set to not controlled
    - iSCSI devices *backing root* are set to not controlled
      This can go away when
      https://bugzilla.redhat.com/show_bug.cgi?id=607921
      is fixed.

  This change required splitting of isStorageDevice into three
  finer functions (usedByFCoE, usedBy..., ...). Also note that
  iSCSI case was fixed to count only devices actually used in route
  to the target - code from dracutSetupString moved into function
  ifaceForHostIP is used, as Hans suggested.

* Dialog for selecting devices controlled by NM is removed.
  With all devices controlled by default it doesn't seem useful
  enough.

1 files changed, 12 insertions, 7 deletions

diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index 3f9e2a306..b5977fa61 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -899,21 +899,26 @@ class InstallInterface(InstallInterfaceBase):
         if len(self.anaconda.network.netdevices) == 0:
             return False
 
+        nm_controlled_devices = [devname for (devname, dev)
+                                 in self.anaconda.id.network.netdevices.items()
+                                 if not dev.usedByFCoE(self.anaconda)]
+        if not just_setup and not nm_controlled_devices:
+            return False
+
         from iw.network_gui import (runNMCE,
-                                 selectNetDevicesDialog,
+                                 selectInstallNetDeviceDialog,
                                  selectSSIDsDialog)
 
         networkEnabled = False
         while not networkEnabled:
-            if just_setup and len(self.anaconda.network.netdevices) <= 1:
-                nm_controlled_devices = self.anaconda.network.netdevices.keys()
+
+            if just_setup:
                 install_device = None
             else:
-                choice = selectNetDevicesDialog(self.anaconda.network,
-                                                select_install_device=(not just_setup))
-                if not choice:
+                install_device = selectInstallNetDeviceDialog(self.anaconda.network,
+                                                              nm_controlled_devices)
+                if not install_device:
                     break
-                nm_controlled_devices, install_device = choice
 
             # update ifcfg files for nm-c-e
             self.anaconda.network.setNMControlledDevices(nm_controlled_devices)