Fix connection settings being optional

ConnectionSettings must always be present in connection profile.

Author: igo95862

sdbus_async/networkmanager/settings/profile.py

@@ -96,13 +96,7 @@ class ConnectionProfile:
     A group of related key/value pairs describing a specific piece
     of a Connection (profile). Keys are also referred to as properties.
     """
-    # The settings object "connection" is special: It must always be present
-    # because it contains the UUID and the connection type which are required:
-    connection: ConnectionSettings = field(
-        metadata={'dbus_name': 'connection',
-                  'settings_class': ConnectionSettings},
-    )
-    # The list of the remaining settings classes was generated by
+    # The list of the settings classes was generated by
     # tools/generate-settings-dataclasses-jinja.py which generates the
     # settings classes themselfes as well.
     # If possible, please make changes by also updating the script.
@@ -143,10 +137,10 @@ class ConnectionProfile:
                   'settings_class': CdmaSettings},
         default=None,
     )
-    connection: Optional[ConnectionSettings] = field(
+    connection: ConnectionSettings = field(
         metadata={'dbus_name': 'connection',
                   'settings_class': ConnectionSettings},
-        default=None,
+        default_factory=ConnectionSettings,
     )
     dcb: Optional[DcbSettings] = field(
         metadata={'dbus_name': 'dcb',

tools/generate-settings-dataclasses-jinja.py

@@ -181,6 +181,13 @@ def datatypes_imports(self) -> list[str]:
 
         return datatypes_found
 
+    @cached_property
+    def is_optional_setting(self) -> bool:
+        if self.name == 'connection':
+            return False
+
+        return True
+
 
 def extract_docbook_paragraphs(docbook_node: Element) -> List[str]:
     return [x.text for x in docbook_node]

tools/jinja_templates/profile.py.jinja2

@@ -47,23 +47,21 @@ class ConnectionProfile:
     A group of related key/value pairs describing a specific piece
     of a Connection (profile). Keys are also referred to as properties.
     """
-    # The settings object "connection" is special: It must always be present
-    # because it contains the UUID and the connection type which are required:
-    connection: ConnectionSettings = field(
-        metadata={'dbus_name': 'connection',
-                  'settings_class': ConnectionSettings},
-    )
-    # The list of the remaining settings classes was generated by
+    # The list of the settings classes was generated by
     # tools/generate-settings-dataclasses-jinja.py which generates the
     # settings classes themselfes as well.
     # If possible, please make changes by also updating the script.
 
     # start of the generated list of settings classes
 {%- for setting in all_settings %}
-    {{ setting.snake_name }}: Optional[{{ setting.python_class_name }}] = field(
+    {{ setting.snake_name }}: {%- if setting.is_optional_setting %} Optional[{{ setting.python_class_name }}] {% else %} {{ setting.python_class_name }} {% endif -%} = field(
         metadata={'dbus_name': '{{ setting.name }}',
                   'settings_class': {{ setting.python_class_name }}},
+{%- if setting.is_optional_setting %}
         default=None,
+{%- else %}
+        default_factory={{ setting.python_class_name }},
+{%- endif %}
     )
 {%- endfor %}
     # end of the generated list of settings classes