diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.IPv4.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.IPv4.bus.xml
deleted file mode 120000
index 7b1c091d22..0000000000
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.IPv4.bus.xml
+++ /dev/null
@@ -1 +0,0 @@
-org.opensuse.Agama.Network1.Connection.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.Wireless.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.Wireless.bus.xml
deleted file mode 120000
index 7b1c091d22..0000000000
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.Wireless.bus.xml
+++ /dev/null
@@ -1 +0,0 @@
-org.opensuse.Agama.Network1.Connection.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.IP.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.IP.bus.xml
new file mode 120000
index 0000000000..06ac291eab
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.IP.bus.xml
@@ -0,0 +1 @@
+org.opensuse.Agama1.Network.Connection.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Match.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Match.bus.xml
new file mode 120000
index 0000000000..06ac291eab
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Match.bus.xml
@@ -0,0 +1 @@
+org.opensuse.Agama1.Network.Connection.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Wireless.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Wireless.bus.xml
new file mode 120000
index 0000000000..06ac291eab
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.Wireless.bus.xml
@@ -0,0 +1 @@
+org.opensuse.Agama1.Network.Connection.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.bus.xml
similarity index 62%
rename from doc/dbus/bus/org.opensuse.Agama.Network1.Connection.bus.xml
rename to doc/dbus/bus/org.opensuse.Agama1.Network.Connection.bus.xml
index 4351d4b7b6..954853b172 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Connection.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Connection.bus.xml
@@ -1,13 +1,42 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg type="s" direction="out"/>
     </method>
   </interface>
-  <interface name="org.opensuse.Agama.Network1.Connection">
+  <interface name="org.freedesktop.DBus.Peer">
+    <method name="Ping">
+    </method>
+    <method name="GetMachineId">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg type="v" direction="out"/>
+    </method>
+    <method name="Set">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
+    </method>
+    <method name="GetAll">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg type="a{sv}" direction="out"/>
+    </method>
+    <!--
+     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
+     -->
+    <signal name="PropertiesChanged">
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
+    </signal>
+  </interface>
+  <interface name="org.opensuse.Agama1.Network.Connection">
     <!--
      Connection ID.
 
@@ -16,8 +45,9 @@
      now), it uses the original ID but appending a number in case the ID is duplicated.
      -->
     <property name="Id" type="s" access="read"/>
+    <property name="Interface" type="s" access="readwrite"/>
   </interface>
-  <interface name="org.opensuse.Agama.Network1.Connection.IPv4">
+  <interface name="org.opensuse.Agama1.Network.Connection.IP">
     <!--
      List of IP addresses.
 
@@ -25,32 +55,63 @@
      -->
     <property name="Addresses" type="as" access="readwrite"/>
     <!--
-     Network gateway.
+     Network gateway for IPv4.
+
+     An empty string removes the current value.
+     -->
+    <property name="Gateway4" type="s" access="readwrite"/>
+    <!--
+     Network gateway for IPv6.
+
+     An empty string removes the current value.
+     -->
+    <property name="Gateway6" type="s" access="readwrite"/>
+    <!--
+     IPv4 configuration method.
 
-     An empty string removes the current value. It is not possible to set a gateway if the
-     Addresses property is empty.
+     Possible values: "disabled", "auto", "manual" or "link-local".
+
+     See [crate::network::model::IpMethod].
      -->
-    <property name="Gateway" type="s" access="readwrite"/>
+    <property name="Method4" type="s" access="readwrite"/>
     <!--
-     IP configuration method.
+     IPv6 configuration method.
 
      Possible values: "disabled", "auto", "manual" or "link-local".
 
-     See [crate::model::IpMethod].
+     See [crate::network::model::IpMethod].
      -->
-    <property name="Method" type="s" access="readwrite"/>
+    <property name="Method6" type="s" access="readwrite"/>
     <!--
      Name server addresses.
      -->
     <property name="Nameservers" type="as" access="readwrite"/>
   </interface>
-  <interface name="org.opensuse.Agama.Network1.Connection.Wireless">
+  <interface name="org.opensuse.Agama1.Network.Connection.Match">
+    <!--
+     List of driver names to match.
+     -->
+    <property name="Driver" type="as" access="readwrite"/>
+    <!--
+     List of interface names to match.
+     -->
+    <property name="Interface" type="as" access="readwrite"/>
+    <!--
+     List of kernel options to match.
+     -->
+    <property name="Kernel" type="as" access="readwrite"/>
+    <!--
+     List of paths to match against the ID_PATH udev property of devices.
+     -->
+    <property name="Path" type="as" access="readwrite"/>
+  </interface>
+  <interface name="org.opensuse.Agama1.Network.Connection.Wireless">
     <!--
      Wireless connection mode.
 
      Possible values: "unknown", "adhoc", "infrastructure", "ap" or "mesh".
 
-     See [crate::model::WirelessMode].
+     See [crate::network::model::WirelessMode].
      -->
     <property name="Mode" type="s" access="readwrite"/>
     <!--
@@ -67,40 +128,8 @@
      Possible values: "none", "owe", "ieee8021x", "wpa-psk", "sae", "wpa-eap",
      "wpa-eap-suite-b192".
 
-     See [crate::model::WirelessMode].
+     See [crate::network::model::SecurityProtocol].
      -->
     <property name="Security" type="s" access="readwrite"/>
   </interface>
-  <interface name="org.freedesktop.DBus.Peer">
-    <method name="Ping">
-    </method>
-    <method name="GetMachineId">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
-  <interface name="org.freedesktop.DBus.Properties">
-    <method name="Get">
-      <arg name="interface_name" type="s" direction="in"/>
-      <arg name="property_name" type="s" direction="in"/>
-      <arg type="v" direction="out"/>
-    </method>
-    <method name="Set">
-      <arg name="interface_name" type="s" direction="in"/>
-      <arg name="property_name" type="s" direction="in"/>
-      <arg name="value" type="v" direction="in"/>
-    </method>
-    <method name="GetAll">
-      <arg name="interface_name" type="s" direction="in"/>
-      <arg type="a{sv}" direction="out"/>
-    </method>
-    <!--
-     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
-     -->
-    <signal name="PropertiesChanged">
-      <arg name="interface_name" type="s"/>
-      <arg name="changed_properties" type="a{sv}"/>
-      <arg name="invalidated_properties" type="as"/>
-    </signal>
-  </interface>
 </node>
-
diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Connections.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Connections.bus.xml
similarity index 85%
rename from doc/dbus/bus/org.opensuse.Agama.Network1.Connections.bus.xml
rename to doc/dbus/bus/org.opensuse.Agama1.Network.Connections.bus.xml
index 3c840bdea8..9bf1827055 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Connections.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Connections.bus.xml
@@ -1,7 +1,10 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
   <interface name="org.freedesktop.DBus.Peer">
     <method name="Ping">
     </method>
@@ -33,7 +36,7 @@
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
-  <interface name="org.opensuse.Agama.Network1.Connections">
+  <interface name="org.opensuse.Agama1.Network.Connections">
     <!--
      Returns the D-Bus paths of the network connections.
      -->
@@ -43,8 +46,8 @@
     <!--
      Adds a new network connection.
 
-     * `name`: connection name.
-     * `ty`: connection type (see [crate::model::DeviceType]).
+     * `id`: connection name.
+     * `ty`: connection type (see [agama_lib::network::types::DeviceType]).
      -->
     <method name="AddConnection">
       <arg name="id" type="s" direction="in"/>
@@ -74,11 +77,12 @@
      -->
     <method name="Apply">
     </method>
-  </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg type="s" direction="out"/>
-    </method>
+    <!--
+     Notifies than a new interface has been added.
+     -->
+    <signal name="ConnectionAdded">
+      <arg name="id" type="s"/>
+      <arg name="path" type="o"/>
+    </signal>
   </interface>
 </node>
-
diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Device.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Device.bus.xml
similarity index 86%
rename from doc/dbus/bus/org.opensuse.Agama.Network1.Device.bus.xml
rename to doc/dbus/bus/org.opensuse.Agama1.Network.Device.bus.xml
index c00ecd8fa3..d45f8c5cb7 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Device.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Device.bus.xml
@@ -1,7 +1,10 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
   <interface name="org.freedesktop.DBus.Peer">
     <method name="Ping">
     </method>
@@ -9,11 +12,6 @@
       <arg type="s" direction="out"/>
     </method>
   </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
       <arg name="interface_name" type="s" direction="in"/>
@@ -38,7 +36,7 @@
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
-  <interface name="org.opensuse.Agama.Network1.Device">
+  <interface name="org.opensuse.Agama1.Network.Device">
     <!--
      Device name.
 
@@ -50,9 +48,8 @@
 
      Possible values: 0 = loopback, 1 = ethernet, 2 = wireless.
 
-     See [crate::model::DeviceType].
+     See [agama_lib::network::types::DeviceType].
      -->
     <property name="Type" type="y" access="read"/>
   </interface>
 </node>
-
diff --git a/doc/dbus/bus/org.opensuse.Agama.Network1.Devices.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Network.Devices.bus.xml
similarity index 87%
rename from doc/dbus/bus/org.opensuse.Agama.Network1.Devices.bus.xml
rename to doc/dbus/bus/org.opensuse.Agama1.Network.Devices.bus.xml
index 0b1f278bff..77b654e59f 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Network1.Devices.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama1.Network.Devices.bus.xml
@@ -1,13 +1,8 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <interface name="org.opensuse.Agama.Network1.Devices">
-    <!--
-     Returns the D-Bus paths of the network devices.
-     -->
-    <method name="GetDevices">
-      <arg type="ao" direction="out"/>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.Peer">
@@ -17,11 +12,6 @@
       <arg type="s" direction="out"/>
     </method>
   </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
       <arg name="interface_name" type="s" direction="in"/>
@@ -46,5 +36,12 @@
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
+  <interface name="org.opensuse.Agama1.Network.Devices">
+    <!--
+     Returns the D-Bus paths of the network devices.
+     -->
+    <method name="GetDevices">
+      <arg type="ao" direction="out"/>
+    </method>
+  </interface>
 </node>
-
diff --git a/doc/dbus/bus/seed.sh b/doc/dbus/bus/seed.sh
index 49f013b792..332cd891b3 100755
--- a/doc/dbus/bus/seed.sh
+++ b/doc/dbus/bus/seed.sh
@@ -35,7 +35,6 @@ look Manager1
 look Software1
 look Software1.Proposal
 look Storage1
-look Users1
 
 abusctl introspect --xml-interface \
   ${DD}1 \
@@ -64,3 +63,56 @@ abusctl introspect --xml-interface \
   ${SS}1/Questions/1 \
   | cleanup \
   > ${DD}1.Questions.WithPassword.bus.xml
+
+# Network interfaces
+abusctl call \
+  ${DD}1 \
+  ${SS}1/Network/connections \
+  ${DD}1.Network.Connections \
+  AddConnection "sy" "wireless0" 2
+
+OBJ=$(abusctl call \
+  ${DD}1 \
+  ${SS}1/Network/connections \
+  ${DD}1.Network.Connections \
+  GetConnection "s" "wireless0" | cut -f2 -d\")
+
+abusctl introspect --xml-interface \
+  ${DD}1 \
+  ${OBJ} \
+  ${DD}1.Network.Connection \
+  | cleanup \
+  >${DD}1.Network.Connection.bus.xml
+
+abusctl call \
+  ${DD}1 \
+  ${SS}1/Network/connections \
+  ${DD}1.Network.Connections \
+  RemoveConnection "s" "wireless0"
+
+abusctl introspect --xml-interface \
+  ${DD}1 \
+  ${SS}1/Network/connections \
+  ${DD}1.Network.Connections \
+  | cleanup \
+  >${DD}1.Network.Connections.bus.xml
+
+abusctl introspect --xml-interface \
+  ${DD}1 \
+  ${SS}1/Network/devices \
+  ${DD}1.Network.Devices \
+  | cleanup \
+  >${DD}1.Network.Devices.bus.xml
+
+abusctl introspect --xml-interface \
+  ${DD}1 \
+  ${SS}1/Network/devices/0 \
+  ${DD}1.Network.Device \
+  | cleanup \
+  >${DD}1.Network.Device.bus.xml
+
+abusctl introspect --xml-interface \
+  ${DD}.Manager1 \
+  ${SS}/Users1 \
+  | cleanup \
+  >${DD}.Users1.bus.xml
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Connection.IPv4.doc.xml b/doc/dbus/org.opensuse.Agama.Network1.Connection.IPv4.doc.xml
deleted file mode 100644
index d174947130..0000000000
--- a/doc/dbus/org.opensuse.Agama.Network1.Connection.IPv4.doc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.opensuse.Agama.Network1.Connection.IPv4">
-    <!--
-     List of IP addresses.
-
-     When the method is 'auto', these addresses are used as additional addresses.
-     -->
-    <property name="Addresses" type="as" access="readwrite"/>
-    <!--
-     Network gateway.
-
-     An empty string removes the current value. It is not possible to set a gateway if the
-     Addresses property is empty.
-     -->
-    <property name="Gateway" type="s" access="readwrite"/>
-    <!--
-     IP configuration method.
-
-     Possible values: "disabled", "auto", "manual" or "link-local".
-
-     See [crate::model::IpMethod].
-     -->
-    <property name="Method" type="s" access="readwrite"/>
-    <!--
-     Name server addresses.
-     -->
-    <property name="Nameservers" type="as" access="readwrite"/>
-  </interface>
-</node>
-
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Devices.doc.xml b/doc/dbus/org.opensuse.Agama.Network1.Devices.doc.xml
deleted file mode 100644
index d11df5f3cc..0000000000
--- a/doc/dbus/org.opensuse.Agama.Network1.Devices.doc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.opensuse.Agama.Network1.Devices">
-    <!--
-     GetDevices:
-     Returns the D-Bus paths of the network devices.
-     -->
-    <method name="GetDevices">
-      <arg type="ao" direction="out"/>
-    </method>
-  </interface>
-</node>
-
diff --git a/doc/dbus/org.opensuse.Agama.Software1.bus.xml b/doc/dbus/org.opensuse.Agama.Software1.bus.xml
deleted file mode 100644
index cd7eb6c4f6..0000000000
--- a/doc/dbus/org.opensuse.Agama.Software1.bus.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/opensuse/Agama/Software1">
-  <node name="Proposal"/>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="xml_data" direction="out" type="s"/>
-    </method>
-  </interface>
-  <interface name="org.freedesktop.DBus.Properties">
-    <method name="Get">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="v"/>
-    </method>
-    <method name="Set">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="val" direction="in" type="v"/>
-    </method>
-    <method name="GetAll">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="a{sv}"/>
-    </method>
-    <signal name="PropertiesChanged">
-      <arg name="interface" type="s"/>
-      <arg name="changed_properties" type="a{sv}"/>
-      <arg name="invalidated_properties" type="as"/>
-    </signal>
-  </interface>
-  <interface name="org.opensuse.Agama.Software1">
-    <!--
-      SelectProduct:
-      @ProductID: product identifier
-
-      Select product for Installation.
-    -->
-    <method name="SelectProduct">
-      <arg name="ProductID" direction="in" type="s"/>
-    </method>
-    <!--
-      ListPatterns:
-      @Filtered: Flag if result should contain only filtered patterns for user.
-                 Decision about criteria is on backend.
-      @Result:   map with pattern id as key and as value is struct with
-                 category, description, icon, summary and order for pattern
-
-      List available patterns.
-    -->
-    <method name="ListPatterns">
-      <arg name="Filtered" direction="in" type="b"/>
-      <arg name="Result" direction="out" type="a{s(ssssi)}"/>
-    </method>
-    <method name="ProvisionsSelected">
-      <arg name="Provisions" direction="in" type="as"/>
-      <arg name="Result" direction="out" type="ab"/>
-    </method>
-    <method name="IsPackageInstalled">
-      <arg name="Name" direction="in" type="s"/>
-      <arg name="Result" direction="out" type="b"/>
-    </method>
-    <method name="UsedDiskSpace">
-      <arg name="SpaceSize" direction="out" type="s"/>
-    </method>
-    <method name="Probe">
-    </method>
-    <method name="Propose">
-    </method>
-    <method name="Install">
-    </method>
-    <method name="Finish">
-    </method>
-    <!--
-     property that defines list of available base products.
-     It is id of product, human readable name and dict for future extensions
-     It is ordered by display priority
-     -->
-    <property type="a(ssa{sv})" name="AvailableBaseProducts" access="read"/>
-    <!--
-     property that shows which base product was selected
-     -->
-    <property type="s" name="SelectedBaseProduct" access="read"/>
-  </interface>
-  <interface name="org.opensuse.Agama1.Progress">
-    <property type="u" name="TotalSteps" access="read"/>
-    <property type="(us)" name="CurrentStep" access="read"/>
-    <property type="b" name="Finished" access="read"/>
-  </interface>
-  <interface name="org.opensuse.Agama1.ServiceStatus">
-    <property type="aa{sv}" name="All" access="read"/>
-    <property type="u" name="Current" access="read"/>
-  </interface>
-  <interface name="org.opensuse.Agama1.Validation">
-    <property type="as" name="Errors" access="read"/>
-    <property type="b" name="Valid" access="read"/>
-  </interface>
-</node>
diff --git a/doc/dbus/org.opensuse.Agama1.Network.Connection.IP.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Connection.IP.doc.xml
new file mode 100644
index 0000000000..841aa314bd
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama1.Network.Connection.IP.doc.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+  <interface name="org.opensuse.Agama1.Network.Connection.IP">
+    <!--
+     List of IP addresses.
+
+     When the method is 'auto', these addresses are used as additional addresses.
+     -->
+    <property name="Addresses" type="as" access="readwrite"/>
+    <!--
+     Network gateway for IPv4.
+
+     An empty string removes the current value.
+     -->
+    <property name="Gateway4" type="s" access="readwrite"/>
+    <!--
+     Network gateway for IPv6.
+
+     An empty string removes the current value.
+     -->
+    <property name="Gateway6" type="s" access="readwrite"/>
+    <!--
+     IPv4 configuration method.
+
+     Possible values: "disabled", "auto", "manual" or "link-local".
+
+     See [crate::network::model::IpMethod].
+     -->
+    <property name="Method4" type="s" access="readwrite"/>
+    <!--
+     IPv6 configuration method.
+
+     Possible values: "disabled", "auto", "manual" or "link-local".
+
+     See [crate::network::model::IpMethod].
+     -->
+    <property name="Method6" type="s" access="readwrite"/>
+    <!--
+     Name server addresses.
+     -->
+    <property name="Nameservers" type="as" access="readwrite"/>
+  </interface>
+</node>
diff --git a/doc/dbus/org.opensuse.Agama1.Network.Connection.Match.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Connection.Match.doc.xml
new file mode 100644
index 0000000000..0f7b77cce2
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama1.Network.Connection.Match.doc.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+  <interface name="org.opensuse.Agama1.Network.Connection.Match">
+    <!--
+     List of driver names to match.
+     -->
+    <property name="Driver" type="as" access="readwrite"/>
+    <!--
+     List of interface names to match.
+     -->
+    <property name="Interface" type="as" access="readwrite"/>
+    <!--
+     List of kernel options to match.
+     -->
+    <property name="Kernel" type="as" access="readwrite"/>
+    <!--
+     List of paths to match against the ID_PATH udev property of devices.
+     -->
+    <property name="Path" type="as" access="readwrite"/>
+  </interface>
+</node>
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Connection.Wireless.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Connection.Wireless.doc.xml
similarity index 69%
rename from doc/dbus/org.opensuse.Agama.Network1.Connection.Wireless.doc.xml
rename to doc/dbus/org.opensuse.Agama1.Network.Connection.Wireless.doc.xml
index 184008a809..8d7cfce8af 100644
--- a/doc/dbus/org.opensuse.Agama.Network1.Connection.Wireless.doc.xml
+++ b/doc/dbus/org.opensuse.Agama1.Network.Connection.Wireless.doc.xml
@@ -1,14 +1,12 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <interface name="org.opensuse.Agama.Network1.Connection.Wireless">
+  <interface name="org.opensuse.Agama1.Network.Connection.Wireless">
     <!--
      Wireless connection mode.
 
      Possible values: "unknown", "adhoc", "infrastructure", "ap" or "mesh".
 
-     See [crate::model::WirelessMode].
+     See [crate::network::model::WirelessMode].
      -->
     <property name="Mode" type="s" access="readwrite"/>
     <!--
@@ -25,9 +23,8 @@
      Possible values: "none", "owe", "ieee8021x", "wpa-psk", "sae", "wpa-eap",
      "wpa-eap-suite-b192".
 
-     See [crate::model::WirelessMode].
+     See [crate::network::model::SecurityProtocol].
      -->
     <property name="Security" type="s" access="readwrite"/>
   </interface>
 </node>
-
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Connection.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Connection.doc.xml
similarity index 65%
rename from doc/dbus/org.opensuse.Agama.Network1.Connection.doc.xml
rename to doc/dbus/org.opensuse.Agama1.Network.Connection.doc.xml
index 730f07eb20..849fba7fae 100644
--- a/doc/dbus/org.opensuse.Agama.Network1.Connection.doc.xml
+++ b/doc/dbus/org.opensuse.Agama1.Network.Connection.doc.xml
@@ -1,8 +1,6 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <interface name="org.opensuse.Agama.Network1.Connection">
+  <interface name="org.opensuse.Agama1.Network.Connection">
     <!--
      Connection ID.
 
@@ -11,6 +9,6 @@
      now), it uses the original ID but appending a number in case the ID is duplicated.
      -->
     <property name="Id" type="s" access="read"/>
+    <property name="Interface" type="s" access="readwrite"/>
   </interface>
 </node>
-
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Connections.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Connections.doc.xml
similarity index 73%
rename from doc/dbus/org.opensuse.Agama.Network1.Connections.doc.xml
rename to doc/dbus/org.opensuse.Agama1.Network.Connections.doc.xml
index 8d229b98e8..6ae51fd2a7 100644
--- a/doc/dbus/org.opensuse.Agama.Network1.Connections.doc.xml
+++ b/doc/dbus/org.opensuse.Agama1.Network.Connections.doc.xml
@@ -1,28 +1,23 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <interface name="org.opensuse.Agama.Network1.Connections">
+  <interface name="org.opensuse.Agama1.Network.Connections">
     <!--
-     GetConnections:
      Returns the D-Bus paths of the network connections.
      -->
     <method name="GetConnections">
       <arg type="ao" direction="out"/>
     </method>
     <!--
-     AddConnection:
      Adds a new network connection.
 
      * `id`: connection name.
-     * `ty`: connection type (see [crate::model::DeviceType]).
+     * `ty`: connection type (see [agama_lib::network::types::DeviceType]).
      -->
     <method name="AddConnection">
       <arg name="id" type="s" direction="in"/>
       <arg name="ty" type="y" direction="in"/>
     </method>
     <!--
-     GetConnection:
      Returns the D-Bus path of the network connection.
 
      * `id`: connection ID.
@@ -32,7 +27,6 @@
       <arg type="o" direction="out"/>
     </method>
     <!--
-     RemoveConnection:
      Removes a network connection.
 
      * `uuid`: connection UUID..
@@ -41,13 +35,15 @@
       <arg name="id" type="s" direction="in"/>
     </method>
     <!--
-     Apply:
      Applies the network configuration.
 
      It includes adding, updating and removing connections as needed.
      -->
     <method name="Apply">
     </method>
+    <signal name="ConnectionAdded">
+      <arg name="id" type="s"/>
+      <arg name="path" type="o"/>
+    </signal>
   </interface>
 </node>
-
diff --git a/doc/dbus/org.opensuse.Agama.Network1.Device.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Device.doc.xml
similarity index 51%
rename from doc/dbus/org.opensuse.Agama.Network1.Device.doc.xml
rename to doc/dbus/org.opensuse.Agama1.Network.Device.doc.xml
index ee582c3a02..d5c24b6c4f 100644
--- a/doc/dbus/org.opensuse.Agama.Network1.Device.doc.xml
+++ b/doc/dbus/org.opensuse.Agama1.Network.Device.doc.xml
@@ -1,22 +1,19 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <interface name="org.opensuse.Agama.Network1.Device">
+  <interface name="org.opensuse.Agama1.Network.Device">
     <!--
-     Device name
+     Device name.
 
      Kernel device name, e.g., eth0, enp1s0, etc.
      -->
     <property name="Name" type="s" access="read"/>
     <!--
-     Device type
+     Device type.
 
      Possible values: 0 = loopback, 1 = ethernet, 2 = wireless.
 
-     See [crate::model::DeviceType].
+     See [agama_lib::network::types::DeviceType].
      -->
     <property name="Type" type="y" access="read"/>
   </interface>
 </node>
-
diff --git a/doc/dbus/org.opensuse.Agama1.Network.Devices.doc.xml b/doc/dbus/org.opensuse.Agama1.Network.Devices.doc.xml
new file mode 100644
index 0000000000..05fd159527
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama1.Network.Devices.doc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+  <interface name="org.opensuse.Agama1.Network.Devices">
+    <!--
+     Returns the D-Bus paths of the network devices.
+     -->
+    <method name="GetDevices">
+      <arg type="ao" direction="out"/>
+    </method>
+  </interface>
+</node>
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces.rs b/rust/agama-dbus-server/src/network/dbus/interfaces.rs
index f0194391ef..32506d53ef 100644
--- a/rust/agama-dbus-server/src/network/dbus/interfaces.rs
+++ b/rust/agama-dbus-server/src/network/dbus/interfaces.rs
@@ -164,11 +164,12 @@ impl Connections {
         Ok(())
     }
 
+    /// Notifies than a new interface has been added.
     #[dbus_interface(signal)]
     pub async fn connection_added(
         ctxt: &SignalContext<'_>,
         id: &str,
-        path: &str,
+        path: &ObjectPath<'_>,
     ) -> zbus::Result<()>;
 }
 
@@ -279,7 +280,7 @@ impl Match {
 
 #[dbus_interface(name = "org.opensuse.Agama1.Network.Connection.Match")]
 impl Match {
-    /// List of driver
+    /// List of driver names to match.
     #[dbus_interface(property)]
     pub async fn driver(&self) -> Vec<String> {
         let connection = self.get_connection().await;
@@ -294,7 +295,7 @@ impl Match {
         self.update_connection(connection).await
     }
 
-    /// List of paths
+    /// List of paths to match agains the ID_PATH udev property of devices.
     #[dbus_interface(property)]
     pub async fn path(&self) -> Vec<String> {
         let connection = self.get_connection().await;
@@ -308,7 +309,7 @@ impl Match {
         config.path = path;
         self.update_connection(connection).await
     }
-    /// List of driver
+    /// List of interface names to match.
     #[dbus_interface(property)]
     pub async fn interface(&self) -> Vec<String> {
         let connection = self.get_connection().await;
@@ -323,7 +324,7 @@ impl Match {
         self.update_connection(connection).await
     }
 
-    /// List of kernel options
+    /// List of kernel options to match.
     #[dbus_interface(property)]
     pub async fn kernel(&self) -> Vec<String> {
         let connection = self.get_connection().await;
diff --git a/rust/agama-dbus-server/src/network/dbus/tree.rs b/rust/agama-dbus-server/src/network/dbus/tree.rs
index c21e87da91..3715a6b94c 100644
--- a/rust/agama-dbus-server/src/network/dbus/tree.rs
+++ b/rust/agama-dbus-server/src/network/dbus/tree.rs
@@ -202,7 +202,11 @@ impl Tree {
     }
 
     /// Notify that a new connection has been added
-    async fn notify_connection_added(&self, id: &str, path: &str) -> Result<(), ServiceError> {
+    async fn notify_connection_added(
+        &self,
+        id: &str,
+        path: &ObjectPath<'_>,
+    ) -> Result<(), ServiceError> {
         let object_server = self.connection.object_server();
         let iface_ref = object_server
             .interface::<_, interfaces::Connections>(CONNECTIONS_PATH)
diff --git a/rust/agama-lib/src/network/client.rs b/rust/agama-lib/src/network/client.rs
index 1ac2d2510f..9f4dc02df2 100644
--- a/rust/agama-lib/src/network/client.rs
+++ b/rust/agama-lib/src/network/client.rs
@@ -163,7 +163,7 @@ impl<'a> NetworkClient<'a> {
 
         loop {
             let signal = stream.next().await.unwrap();
-            let (id, _path): (String, String) = signal.body().unwrap();
+            let (id, _path): (String, OwnedObjectPath) = signal.body().unwrap();
             if id == conn.id {
                 break;
             };