summaryrefslogtreecommitdiff
path: root/introspection
diff options
context:
space:
mode:
authorThomas Graf <tgraf@redhat.com>2012-10-29 19:02:45 -0500
committerDan Williams <dcbw@redhat.com>2012-11-30 13:21:51 -0600
commitcfff5a63d92cdccd6266b56308572c2683b5c4dd (patch)
tree47e5af32e28d6fd06d510d436d46fe8eba0efd6c /introspection
parent20e60deccb023917f89bd3d5433295a72af67566 (diff)
bridge: add bridge device type
This adds a new device type 'bridge'. Kernel devices are created on demand.
Diffstat (limited to 'introspection')
-rw-r--r--introspection/Makefile.am1
-rw-r--r--introspection/all.xml.in1
-rw-r--r--introspection/nm-device-bridge.xml27
-rw-r--r--introspection/nm-device.xml5
4 files changed, 34 insertions, 0 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index a267b51a18..3850a23464 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
nm-device-wimax.xml \
nm-device-infiniband.xml \
nm-device-bond.xml \
+ nm-device-bridge.xml \
nm-device-vlan.xml \
nm-device.xml \
nm-ip4-config.xml \
diff --git a/introspection/all.xml.in b/introspection/all.xml.in
index e9e7b0e06a..a8cea6134d 100644
--- a/introspection/all.xml.in
+++ b/introspection/all.xml.in
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<xi:include href="nm-device-wimax.xml"/>
<xi:include href="nm-device-infiniband.xml"/>
<xi:include href="nm-device-bond.xml"/>
+<xi:include href="nm-device-bridge.xml"/>
<xi:include href="nm-device-vlan.xml"/>
<xi:include href="nm-device-adsl.xml"/>
<xi:include href="nm-wimax-nsp.xml"/>
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
new file mode 100644
index 0000000000..67ce419af0
--- /dev/null
+++ b/introspection/nm-device-bridge.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+ <interface name="org.freedesktop.NetworkManager.Device.Bridge">
+
+ <property name="HwAddress" type="s" access="read">
+ <tp:docstring>
+ Hardware address of the device.
+ </tp:docstring>
+ </property>
+
+ <property name="Carrier" type="b" access="read">
+ <tp:docstring>
+ Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+ </tp:docstring>
+ </property>
+
+ <signal name="PropertiesChanged">
+ <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+ <tp:docstring>
+ A dictionary mapping property names to variant boxed values
+ </tp:docstring>
+ </arg>
+ </signal>
+
+ </interface>
+</node>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 8d99c6ab15..608818bb53 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -218,6 +218,11 @@
The device is in a failure state following an attempt to activate it.
</tp:docstring>
</tp:enumvalue>
+ <tp:enumvalue suffix="BRIDGE" value="13">
+ <tp:docstring>
+ The device is a bridge interface.
+ </tp:docstring>
+ </tp:enumvalue>
</tp:enum>
<tp:enum name="NM_DEVICE_TYPE" type="u">