move AddressData, Routedata to settings/datatypes.py

Author: Bernhard Kaindl

sdbus_async/networkmanager/settings.py

@@ -23,6 +23,7 @@
 from typing import Any, Dict, List, Optional
 
 from .settings.base import NetworkManagerSettingsMixin
+from .settings.datatypes import AddressData, RouteData
 from .types import NetworkManagerConnectionProperties
 
 # See https://networkmanager.dev/docs/api/latest/nm-settings-dbus.html
@@ -137,34 +138,6 @@ class ConnectionSettings(NetworkManagerSettingsMixin):
     )
 
 
-@dataclass
-class AddressData(NetworkManagerSettingsMixin):
-    address: str = field(
-        metadata={'dbus_name': 'address', 'dbus_type': 's'},
-    )
-    prefix: int = field(
-        metadata={'dbus_name': 'prefix', 'dbus_type': 'u'},
-    )
-
-
-@dataclass
-class RouteData(NetworkManagerSettingsMixin):
-    dest: str = field(
-        metadata={'dbus_name': 'dest', 'dbus_type': 's'},
-    )
-    prefix: int = field(
-        metadata={'dbus_name': 'prefix', 'dbus_type': 'u'},
-    )
-    next_hop: Optional[str] = field(
-        metadata={'dbus_name': 'next-hop', 'dbus_type': 's'},
-        default=None,
-    )
-    metric: Optional[int] = field(
-        metadata={'dbus_name': 'metric', 'dbus_type': 'u'},
-        default=None,
-    )
-
-
 @dataclass
 class Ipv4Settings(NetworkManagerSettingsMixin):
     address_data: Optional[List[AddressData]] = field(

sdbus_async/networkmanager/settings/datatypes.py

@@ -0,0 +1,32 @@
+from dataclasses import dataclass, field
+from typing import Optional
+
+from .base import NetworkManagerSettingsMixin
+
+
+@dataclass
+class AddressData(NetworkManagerSettingsMixin):
+    address: str = field(
+        metadata={'dbus_name': 'address', 'dbus_type': 's'},
+    )
+    prefix: int = field(
+        metadata={'dbus_name': 'prefix', 'dbus_type': 'u'},
+    )
+
+
+@dataclass
+class RouteData(NetworkManagerSettingsMixin):
+    dest: str = field(
+        metadata={'dbus_name': 'dest', 'dbus_type': 's'},
+    )
+    prefix: int = field(
+        metadata={'dbus_name': 'prefix', 'dbus_type': 'u'},
+    )
+    next_hop: Optional[str] = field(
+        metadata={'dbus_name': 'next-hop', 'dbus_type': 's'},
+        default=None,
+    )
+    metric: Optional[int] = field(
+        metadata={'dbus_name': 'metric', 'dbus_type': 'u'},
+        default=None,
+    )