Add enums.ConnectionType as basic class (no enum)

Author: Bernhard Kaindl

examples/async/add-wifi-psk-connection-async.py

@@ -46,15 +46,16 @@
 import asyncio
 import binascii
 import functools
-import pprint
 import sdbus
 import uuid
 from argparse import ArgumentParser, Namespace
 from passlib.utils.pbkdf2 import pbkdf2  # type: ignore
+from pprint import pprint
 from sdbus_async.networkmanager import (
     NetworkManagerSettings as SettingsManager,
     ConnectionProfile,
     ConnectionSettings,
+    ConnectionType,
     Ipv4Settings,
     Ipv6Settings,
     WirelessSettings,
@@ -79,7 +80,7 @@ async def add_wifi_psk_connection_profile_async(args: Namespace) -> None:
     profile = ConnectionProfile(
         connection=ConnectionSettings(
             uuid=str(uuid.uuid4()),
-            connection_type='802-11-wireless',
+            connection_type=ConnectionType.WIFI,
             connection_id=args.conn_id,
             autoconnect=args.auto,
         ),
@@ -104,7 +105,7 @@ async def add_wifi_psk_connection_profile_async(args: Namespace) -> None:
 
     print(f'nmcli connection show "{args.conn_id}"|grep -v -e -- -e default')
     print("Settings used:")
-    functools.partial(pprint.pprint, sort_dicts=False)(profile.to_dbus())
+    functools.partial(pprint, sort_dicts=False)(profile.to_settings_dict())
 
 
 if __name__ == "__main__":

examples/async/list-connections-async.py

@@ -53,7 +53,7 @@ async def print_connection_profile(connection_path: str) -> None:
             print(f'      route-metric: {profile.ipv4.route_metric}')
     if profile.ipv6:
         print("ipv6: method:", profile.ipv6.method)
-    pprint.pprint(profile.to_dbus())
+    pprint.pprint(profile.to_settings_dict(), sort_dicts=False)
 
 
 if __name__ == "__main__":

sdbus_async/networkmanager/__init__.py

@@ -26,6 +26,7 @@
     ConnectionState,
     ConnectionStateFlags,
     ConnectionStateReason,
+    ConnectionType,
     ConnectivityState,
     DeviceCapabilities,
     DeviceInterfaceFlags,
@@ -269,7 +270,7 @@
 __all__ = (
     'AccessPointCapabilities', 'BluetoothCapabilities',
     'ConnectionFlags', 'ConnectionState', 'ConnectionStateFlags',
-    'ConnectionStateReason', 'ConnectivityState',
+    'ConnectionStateReason', 'ConnectivityState', 'ConnectionType',
     'DeviceCapabilities', 'DeviceInterfaceFlags', 'DeviceMetered',
     'DeviceState', 'DeviceStateReason', 'DeviceType', 'IpTunnelMode',
     'ModemCapabilities', 'NetworkManagerConnectivityState',

sdbus_async/networkmanager/enums.py

@@ -473,6 +473,59 @@ class DeviceStateReason(IntEnum):
     PEER_NOT_FOUND = 67
 
 
+# Connection Types, e.g. from connecion_profile.connection.type:
+#
+# There is no central list of all connection types in NM.
+# The best bet is to look for nm_connection_is_type() checks which use
+# NM_SETTING_(TYPE)_SETTING_NAME #defines (which are fined used for
+# settings for this connection-type. One connection_type can have several
+# of such settings groups, so we have to filter those to get the strings:
+#
+# Generated from NetworkManager source using:
+# grep -r nm_connection_is_type src/|
+#     sed -n 's/.*NM_SETTING_/NM_SETTING_/;s/_SETTING_NAME.*/=/p' |
+#     sort -u >.connection_is_type
+# grep -hr define.*_SETTING_NAME src/|
+#     sed 's/#define //;s/_SETTING_NAME//;s/ /=/' >.setting_defines
+# grep -f .connection_is_type .setting_defines |
+#     sed 's/NM_SETTING_/    /;s/6L/SIXL/;/GENERIC/d;s/=/ = /'
+#
+# One src/core/nm-device-*.c can support more than one ConnectionType,
+# thus there are more ConnectionTypes than DeviceTypes:
+
+# From NetworkManager-1.35:
+class ConnectionType():
+    ADSL = "adsl"
+    BLUETOOTH = "bluetooth"
+    BOND = "bond"
+    BRIDGE = "bridge"
+    CDMA = "cdma"
+    DUMMY = "dummy"
+    GSM = "gsm"
+    INFINIBAND = "infiniband"
+    IP_TUNNEL = "ip-tunnel"
+    MACSEC = "macsec"
+    MACVLAN = "macvlan"
+    OLPC_MESH = "802-11-olpc-mesh"
+    OVS_BRIDGE = "ovs-bridge"
+    OVS_INTERFACE = "ovs-interface"
+    OVS_PORT = "ovs-port"
+    PPPOE = "pppoe"
+    SIXLOWPAN = "6lowpan"
+    TEAM = "team"
+    TUN = "tun"
+    VETH = "veth"
+    VLAN = "vlan"
+    VPN = "vpn"
+    VRF = "vrf"
+    VXLAN = "vxlan"
+    WIFI_P2P = "wifi-p2p"
+    WIRED = "802-3-ethernet"
+    WIREGUARD = "wireguard"
+    WIFI = "802-11-wireless"
+    WPAN = "wpan"
+
+
 class DeviceType(IntEnum):
     """Device Type
 

sdbus_async/networkmanager/settings/connection.py

@@ -11,6 +11,15 @@
 class ConnectionSettings(NetworkManagerSettingsMixin):
     """General Connection Profile Settings"""
 
+    connection_id: str = field(
+        metadata={'dbus_name': 'id', 'dbus_type': 's'},
+    )
+    connection_type: str = field(
+        metadata={'dbus_name': 'type', 'dbus_type': 's'},
+    )
+    uuid: str = field(
+        metadata={'dbus_name': 'uuid', 'dbus_type': 's'},
+    )
     auth_retries: Optional[int] = field(
         metadata={'dbus_name': 'auth-retries', 'dbus_type': 'i'},
         default=None,
@@ -39,10 +48,6 @@ class ConnectionSettings(NetworkManagerSettingsMixin):
         metadata={'dbus_name': 'gateway-ping-timeout', 'dbus_type': 'u'},
         default=None,
     )
-    connection_id: Optional[str] = field(
-        metadata={'dbus_name': 'id', 'dbus_type': 's'},
-        default=None,
-    )
     interface_name: Optional[str] = field(
         metadata={'dbus_name': 'interface-name', 'dbus_type': 's'},
         default=None,
@@ -99,14 +104,6 @@ class ConnectionSettings(NetworkManagerSettingsMixin):
         metadata={'dbus_name': 'timestamp', 'dbus_type': 't'},
         default=None,
     )
-    connection_type: Optional[str] = field(
-        metadata={'dbus_name': 'type', 'dbus_type': 's'},
-        default=None,
-    )
-    uuid: Optional[str] = field(
-        metadata={'dbus_name': 'uuid', 'dbus_type': 's'},
-        default=None,
-    )
     wait_device_timeout: Optional[int] = field(
         metadata={'dbus_name': 'wait-device-timeout', 'dbus_type': 'i'},
         default=None,