Skip to content

Commit 5c444ae

Browse files
committed
Regenerate all settings with new jinja based generator
1 parent 79aec58 commit 5c444ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4447
-2234
lines changed

sdbus_async/networkmanager/__init__.py

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -194,55 +194,9 @@
194194
NetworkManagerSettings,
195195
WiFiP2PPeer,
196196
)
197-
from .settings.adsl import AdslSettings
198-
from .settings.bluetooth import BluetoothSettings
199-
from .settings.bond import BondSettings
200-
from .settings.bond_port import BondPortSettings
201-
from .settings.bridge import BridgeSettings
202-
from .settings.bridge_port import BridgePortSettings
203-
from .settings.cdma import CdmaSettings
204-
from .settings.connection import ConnectionSettings
205-
from .settings.datatypes import AddressData, RouteData, WireguardPeers
206-
from .settings.dcb import DcbSettings
207-
from .settings.ethernet import EthernetSettings
208-
from .settings.gsm import GsmSettings
209-
from .settings.hostname import HostnameSettings
210-
from .settings.ieee802_1x import Ieee8021XSettings
211-
from .settings.infiniband import InfinibandSettings
212-
from .settings.ip_tunnel import IpTunnelSettings
213-
from .settings.ipv4 import Ipv4Settings
214-
from .settings.ipv6 import Ipv6Settings
215-
from .settings.lowpan import LowpanSettings
216-
from .settings.macsec import MacsecSettings
217-
from .settings.macvlan import MacvlanSettings
218-
from .settings.match import MatchSettings
219-
from .settings.olpc_mesh import OlpcMeshSettings
220-
from .settings.ovs_bridge import OvsBridgeSettings
221-
from .settings.ovs_dpdk import OvsDpdkSettings
222-
from .settings.ovs_external_ids import OvsExternalIdsSettings
223-
from .settings.ovs_interface import OvsInterfaceSettings
224-
from .settings.ovs_patch import OvsPatchSettings
225-
from .settings.ovs_port import OvsPortSettings
226-
from .settings.ppp import PppSettings
227-
from .settings.pppoe import PppoeSettings
197+
228198
from .settings.profile import ConnectionProfile
229-
from .settings.proxy import ProxySettings
230-
from .settings.serial import SerialSettings
231-
from .settings.team import TeamSettings
232-
from .settings.team_port import TeamPortSettings
233-
from .settings.tun import TunSettings
234-
from .settings.user import UserSettings
235-
from .settings.veth import VethSettings
236-
from .settings.vlan import VlanSettings
237-
from .settings.vpn import VpnSettings
238-
from .settings.vrf import VrfSettings
239-
from .settings.vxlan import VxlanSettings
240-
from .settings.wifi_p2p import WifiP2PSettings
241-
from .settings.wimax import WimaxSettings
242-
from .settings.wireguard import WireguardSettings
243-
from .settings.wireless import WirelessSettings
244-
from .settings.wireless_security import WirelessSecuritySettings
245-
from .settings.wpan import WpanSettings
199+
246200
from .types import (
247201
NetworkManagerConnectionProperties,
248202
NetworkManagerSetting,

sdbus_async/networkmanager/settings/__init__.py

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
2-
# This file was generated by tools/generate-settings-dataclasses.py,
2+
# This file was generated by tools/generate-settings-dataclasses-jinja.py,
33
# if possible, please make changes by also updating the script.
4-
from .connection import ConnectionSettings
5-
from .ipv4 import Ipv4Settings
6-
from .ipv6 import Ipv6Settings
4+
from __future__ import annotations
5+
76
from .adsl import AdslSettings
87
from .bluetooth import BluetoothSettings
98
from .bond import BondSettings
109
from .bond_port import BondPortSettings
1110
from .bridge import BridgeSettings
1211
from .bridge_port import BridgePortSettings
1312
from .cdma import CdmaSettings
13+
from .connection import ConnectionSettings
1414
from .dcb import DcbSettings
15+
from .dummy import DummySettings
16+
from .eapol import EapolSettings
1517
from .ethernet import EthernetSettings
18+
from .ethtool import EthtoolSettings
19+
from .generic import GenericSettings
1620
from .gsm import GsmSettings
1721
from .hostname import HostnameSettings
18-
from .ieee802_1x import Ieee8021XSettings
1922
from .infiniband import InfinibandSettings
2023
from .ip_tunnel import IpTunnelSettings
24+
from .ipv4 import Ipv4Settings
25+
from .ipv6 import Ipv6Settings
2126
from .lowpan import LowpanSettings
2227
from .macsec import MacsecSettings
2328
from .macvlan import MacvlanSettings
@@ -33,6 +38,8 @@
3338
from .pppoe import PppoeSettings
3439
from .proxy import ProxySettings
3540
from .serial import SerialSettings
41+
from .sriov import SriovSettings
42+
from .tc import TcSettings
3643
from .team import TeamSettings
3744
from .team_port import TeamPortSettings
3845
from .tun import TunSettings
@@ -49,24 +56,28 @@
4956
from .wireless_security import WirelessSecuritySettings
5057
from .wpan import WpanSettings
5158

59+
5260
__all__ = (
53-
'ConnectionSettings',
54-
'Ipv4Settings',
55-
'Ipv6Settings',
5661
'AdslSettings',
5762
'BluetoothSettings',
5863
'BondSettings',
5964
'BondPortSettings',
6065
'BridgeSettings',
6166
'BridgePortSettings',
6267
'CdmaSettings',
68+
'ConnectionSettings',
6369
'DcbSettings',
70+
'DummySettings',
71+
'EapolSettings',
6472
'EthernetSettings',
73+
'EthtoolSettings',
74+
'GenericSettings',
6575
'GsmSettings',
6676
'HostnameSettings',
67-
'Ieee8021XSettings',
6877
'InfinibandSettings',
6978
'IpTunnelSettings',
79+
'Ipv4Settings',
80+
'Ipv6Settings',
7081
'LowpanSettings',
7182
'MacsecSettings',
7283
'MacvlanSettings',
@@ -82,6 +93,8 @@
8293
'PppoeSettings',
8394
'ProxySettings',
8495
'SerialSettings',
96+
'SriovSettings',
97+
'TcSettings',
8598
'TeamSettings',
8699
'TeamPortSettings',
87100
'TunSettings',
Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
2-
# This file was generated by tools/generate-settings-dataclasses.py,
2+
# This file was generated by tools/generate-settings-dataclasses-jinja.py,
33
# if possible, please make changes by also updating the script.
44
from __future__ import annotations
55
from dataclasses import dataclass, field
@@ -12,30 +12,58 @@ class AdslSettings(NetworkManagerSettingsMixin):
1212
"""ADSL Settings"""
1313

1414
encapsulation: Optional[str] = field(
15-
metadata={'dbus_name': 'encapsulation', 'dbus_type': 's'},
15+
metadata={
16+
'dbus_name': 'encapsulation',
17+
'dbus_type': 's',
18+
},
1619
default=None,
1720
)
21+
"""Encapsulation of ADSL connection. Can be "vcmux" or "llc"."""
1822
password: Optional[str] = field(
19-
metadata={'dbus_name': 'password', 'dbus_type': 's'},
23+
metadata={
24+
'dbus_name': 'password',
25+
'dbus_type': 's',
26+
},
2027
default=None,
2128
)
29+
"""Password used to authenticate with the ADSL service."""
2230
password_flags: Optional[int] = field(
23-
metadata={'dbus_name': 'password-flags', 'dbus_type': 'i'},
31+
metadata={
32+
'dbus_name': 'password-flags',
33+
'dbus_type': 'u',
34+
},
2435
default=None,
2536
)
37+
"""Flags indicating how to handle the "password" property."""
2638
protocol: Optional[str] = field(
27-
metadata={'dbus_name': 'protocol', 'dbus_type': 's'},
39+
metadata={
40+
'dbus_name': 'protocol',
41+
'dbus_type': 's',
42+
},
2843
default=None,
2944
)
45+
"""ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm"."""
3046
username: Optional[str] = field(
31-
metadata={'dbus_name': 'username', 'dbus_type': 's'},
47+
metadata={
48+
'dbus_name': 'username',
49+
'dbus_type': 's',
50+
},
3251
default=None,
3352
)
53+
"""Username used to authenticate with the ADSL service."""
3454
vci: Optional[int] = field(
35-
metadata={'dbus_name': 'vci', 'dbus_type': 'u'},
55+
metadata={
56+
'dbus_name': 'vci',
57+
'dbus_type': 'u',
58+
},
3659
default=None,
3760
)
61+
"""VCI of ADSL connection"""
3862
vpi: Optional[int] = field(
39-
metadata={'dbus_name': 'vpi', 'dbus_type': 'u'},
63+
metadata={
64+
'dbus_name': 'vpi',
65+
'dbus_type': 'u',
66+
},
4067
default=None,
4168
)
69+
"""VPI of ADSL connection"""
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
2-
# This file was generated by tools/generate-settings-dataclasses.py,
2+
# This file was generated by tools/generate-settings-dataclasses-jinja.py,
33
# if possible, please make changes by also updating the script.
44
from __future__ import annotations
55
from dataclasses import dataclass, field
@@ -12,12 +12,19 @@ class BluetoothSettings(NetworkManagerSettingsMixin):
1212
"""Bluetooth Settings"""
1313

1414
bdaddr: Optional[bytes] = field(
15-
metadata={'dbus_name': 'bdaddr', 'dbus_type': 'ay'},
15+
metadata={
16+
'dbus_name': 'bdaddr',
17+
'dbus_type': 'ay',
18+
},
1619
default=None,
1720
)
21+
"""The Bluetooth address of the device."""
1822
bluetooth_type: Optional[str] = field(
19-
metadata={'dbus_name': 'type', 'dbus_type': 's'},
23+
metadata={
24+
'dbus_name': 'type',
25+
'dbus_type': 's',
26+
},
2027
default=None,
2128
)
22-
"""Either "dun" for Dial-Up Networking connections or "panu" for Personal Area
23-
Networking connections to devices supporting the NAP profile."""
29+
"""Either "dun" for Dial-Up Networking connections or "panu" for Personal
30+
Area Networking connections to devices supporting the NAP profile."""
Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
2-
# This file was generated by tools/generate-settings-dataclasses.py,
2+
# This file was generated by tools/generate-settings-dataclasses-jinja.py,
33
# if possible, please make changes by also updating the script.
44
from __future__ import annotations
55
from dataclasses import dataclass, field
@@ -12,16 +12,22 @@ class BondSettings(NetworkManagerSettingsMixin):
1212
"""Bonding Settings"""
1313

1414
interface_name: Optional[str] = field(
15-
metadata={'dbus_name': 'interface-name', 'dbus_type': 's'},
15+
metadata={
16+
'dbus_name': 'interface-name',
17+
'dbus_type': 's',
18+
},
1619
default=None,
1720
)
1821
"""Deprecated in favor of connection.interface-name, but can be used for
19-
backward-compatibility with older daemons, to set the bond's interface
20-
name."""
22+
backward-compatibility with older daemons, to set the bond's
23+
interface name."""
2124
options: Optional[Dict[str, str]] = field(
22-
metadata={'dbus_name': 'options', 'dbus_type': 'a{ss}'},
23-
default=field(default_factory = lambda: {'mode': 'balance-rr'}),
25+
metadata={
26+
'dbus_name': 'options',
27+
'dbus_type': 'a{ss}',
28+
},
29+
default=None,
2430
)
2531
"""Dictionary of key/value pairs of bonding options. Both keys and values
26-
must be strings. Option names must contain only alphanumeric characters (ie,
27-
[a-zA-Z0-9])."""
32+
must be strings. Option names must contain only alphanumeric
33+
characters (ie, [a-zA-Z0-9])."""

sdbus_async/networkmanager/settings/bond_port.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
2-
# This file was generated by tools/generate-settings-dataclasses.py,
2+
# This file was generated by tools/generate-settings-dataclasses-jinja.py,
33
# if possible, please make changes by also updating the script.
44
from __future__ import annotations
55
from dataclasses import dataclass, field
@@ -12,8 +12,11 @@ class BondPortSettings(NetworkManagerSettingsMixin):
1212
"""Bond Port Settings"""
1313

1414
queue_id: Optional[int] = field(
15-
metadata={'dbus_name': 'queue-id', 'dbus_type': 'u'},
15+
metadata={
16+
'dbus_name': 'queue-id',
17+
'dbus_type': 'u',
18+
},
1619
default=None,
1720
)
18-
"""The queue ID of this bond port. The maximum value of queue ID is the number
19-
of TX queues currently active in device."""
21+
"""The queue ID of this bond port. The maximum value of queue ID is the
22+
number of TX queues currently active in device."""

0 commit comments

Comments
 (0)