network: use consolidated s390 device configuration (#1802482,#1937049)

Implements the znet part of referenced bugs.

Depends on https://github.com/ibm-s390-linux/s390-tools commit
("zdev: add helper for ZNET config conversion from zdev to rd.znet").

Dracut commit ("feat(znet): use zdev for consolidated device
configuration"), replaces the distribution-specific persistent
configuration of s390 (channel-attached) network devices with a common
consolidated mechanism using chzdev from s390-tools. So there is no more
ccw.conf nor s390-specific low-level network config in NetworkManager
connections nor ifcfg files.

Therefore, drop NETTYPE and OPTIONS.

Keep SUBCHANNELS nonetheless because it can still serve as a matching key
for NM connections.

Delegate the generation of rd.znet statements to a helper tool from
s390-tools, which gets its low-level config information from the
consolidated mechanism using chzdev.

There are two different code paths involved:

* Root-fs on something (such as iSCSI or NFS) that depends on znet
  =>_get_dracut_znet_argument_from_connection().
  Related earlier commits:
  commit fa174ab ("Write rd_CCW when root fs is on a network device on s390x (#577193)")
  and lately replacing former code:
  commit f85682f ("network module: add support for getting dracut arguments")
  commit 7cf4d64 ("network module: use network module to get dracut arguments")
  and finally replacing initscripts ifcfg by NetworkManager connection:
  commit 840c984 ("network: generate dracut arguments from connections (#1751189)")
  (Note that this generated rd.znet is independent of the (last) one just
  inherited from the boot parameters between commit 64fb106 ("Preserve
  network args on s390x.") and commit a4ba9ae ("Do not pass rd.znet on
  to installed system unconditionally").)

* Configure znet on boot with rd.znet= but without any corresponding ip=
  and instead use the kickstart command "network" to perform high-level
  configuration of the network interface created with rd.znet. This creates
  a non-initramfs NM connection.
  => pyanaconda.modules.network.initialization.ApplyKickstartTask.run
  => pyanaconda.modules.network.nm_client.add_connection_from_ksdata
  => pyanaconda.modules.network.nm_client.create_connections_from_ksdata
  => get_s390_settings() and _update_wired_connection_with_s390_settings()
  (In contrast, early initrd network setups get both the low-level s390
  config and high-level interface config via nm-initrd-generator,
  which parses rd.znet= as well as ip=.)

Signed-off-by: Steffen Maier <[email protected]>

pyanaconda/modules/network/nm_client.py

@@ -35,6 +35,7 @@
 from pyanaconda.modules.network.utils import get_s390_settings, netmask2prefix, prefix2netmask
 from pyanaconda.modules.network.config_file import is_config_file_for_system
 from pyanaconda.core.dbus import SystemBus
+from pyanaconda.core import util
 
 from pyanaconda.anaconda_loggers import get_module_logger
 log = get_module_logger(__name__)
@@ -437,12 +438,6 @@ def _update_wired_connection_with_s390_settings(connection, s390cfg):
     if s390cfg['SUBCHANNELS']:
         subchannels = s390cfg['SUBCHANNELS'].split(",")
         s_wired.props.s390_subchannels = subchannels
-    if s390cfg['NETTYPE']:
-        s_wired.props.s390_nettype = s390cfg['NETTYPE']
-    if s390cfg['OPTIONS']:
-        opts = s390cfg['OPTIONS'].split(" ")
-        opts_dict = {k: v for k, v in (o.split("=") for o in opts)}
-        s_wired.props.s390_options = opts_dict
 
 
 def _create_new_connection(network_data, device_name):
@@ -1376,15 +1371,10 @@ def _get_dracut_znet_argument_from_connection(connection):
     argument = ""
     wired_setting = connection.get_setting_wired()
     if wired_setting and is_s390():
-        nettype = wired_setting.get_s390_nettype()
-        # get_s390_subchannels() returns a list of subchannels
-        subchannels = wired_setting.get_s390_subchannels()
-        if nettype and subchannels:
-            argument = "rd.znet={},{}".format(nettype, ",".join(subchannels))
-            options = wired_setting.get_property(NM.SETTING_WIRED_S390_OPTIONS)
-            if options:
-                options_string = ','.join("{}={}".format(key, val) for key, val in options.items())
-                argument += ",{}".format(options_string)
+        devspec = util.execWithCapture("/lib/s390-tools/zdev-to-rd.znet",
+                                       ["persistent",
+                                        connection.get_interface_name()]).strip()
+        argument = "rd.znet={}".format(devspec)
     return argument
 
 

pyanaconda/modules/network/utils.py

@@ -34,8 +34,6 @@
 def get_s390_settings(devname):
     cfg = {
         'SUBCHANNELS': '',
-        'NETTYPE': '',
-        'OPTIONS': ''
     }
 
     subchannels = []
@@ -45,23 +43,6 @@ def get_s390_settings(devname):
         return cfg
     cfg['SUBCHANNELS'] = ','.join(subchannels)
 
-    # Example of the ccw.conf file content:
-    # qeth,0.0.0900,0.0.0901,0.0.0902,layer2=0,portname=FOOBAR,portno=0
-    #
-    # SUBCHANNELS="0.0.0900,0.0.0901,0.0.0902"
-    # NETTYPE="qeth"
-    # OPTIONS="layer2=1 portname=FOOBAR portno=0"
-    if not os.path.exists('/run/install/ccw.conf'):
-        return cfg
-    with open('/run/install/ccw.conf') as f:
-        # pylint: disable=redefined-outer-name
-        for line in f:
-            if cfg['SUBCHANNELS'] in line:
-                items = line.strip().split(',')
-                cfg['NETTYPE'] = items[0]
-                cfg['OPTIONS'] = " ".join(i for i in items[1:] if '=' in i)
-                break
-
     return cfg