diff options
| author | Dan Williams <dcbw@redhat.com> | 2012-02-22 23:59:50 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-03-01 17:40:17 -0600 |
| commit | 65a13f9d8aac9f32fb1ce82b0219ac9479ef5b85 (patch) | |
| tree | d54f558a8efff5ac546407158789fc7270029e1c /introspection | |
| parent | 5ee784147588ec207b91eebfafb37bf57b674eab (diff) | |
| download | NetworkManager-65a13f9d8aac9f32fb1ce82b0219ac9479ef5b85.tar.gz | |
core: convert VLAN interfaces to a device subclass
Many different interface types can support VLANs, including
Infiniband, WiFi, etc. So we have to create a new device class
for them instead of keeping the support in NMDeviceEthernet.
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.am | 1 | ||||
| -rw-r--r-- | introspection/all.xml.in | 1 | ||||
| -rw-r--r-- | introspection/nm-device-vlan.xml | 33 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 5 |
4 files changed, 40 insertions, 0 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am index e6e0e23328..ea1c51ba24 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST = \ nm-device-wimax.xml \ nm-device-infiniband.xml \ nm-device-bond.xml \ + nm-device-vlan.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ diff --git a/introspection/all.xml.in b/introspection/all.xml.in index 688ae457a3..406140e96d 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-vlan.xml"/> <xi:include href="nm-wimax-nsp.xml"/> <xi:include href="nm-ip4-config.xml"/> <xi:include href="nm-ip6-config.xml"/> diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml new file mode 100644 index 0000000000..54b7bbe482 --- /dev/null +++ b/introspection/nm-device-vlan.xml @@ -0,0 +1,33 @@ +<?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.Vlan"> + + <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> + + <property name="VlanId" type="u" access="read"> + <tp:docstring> + The VLAN ID of this VLAN interface. + </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 a2b1349b62..0d341e1e1e 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -251,6 +251,11 @@ The device is a bond master interface. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="VLAN" value="11"> + <tp:docstring> + The device is a VLAN interface. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u"> |