[netcf-devel] [PATCH 1/4] Allow bridges with nothing enslaved

[David Lutterkort]

---
 data/xml/interface.rng             |    4 ++--
 tests/initscripts/bridge-empty.xml |   10 ++++++++++
 tests/interface/bridge-empty.xml   |    5 +++++
 tests/test-initscripts.c           |    1 +
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tests/initscripts/bridge-empty.xml
 create mode 100644 tests/interface/bridge-empty.xml

diff --git a/data/xml/interface.rng b/data/xml/interface.rng
index dc367f3..e5e25fe 100644
--- a/data/xml/interface.rng
+++ b/data/xml/interface.rng
@@ -119,12 +119,12 @@
         <optional v:since="2">
           <attribute name="delay"><ref
name="timeval"/></attribute>
         </optional>
-        <oneOrMore>
+        <zeroOrMore>
           <choice>
             <ref name="bare-ethernet-interface"/>
             <ref name="bare-vlan-interface"/>
           </choice>
-        </oneOrMore>
+        </zeroOrMore>
       </element>
     </element>
   </define>
diff --git a/tests/initscripts/bridge-empty.xml b/tests/initscripts/bridge-empty.xml
new file mode 100644
index 0000000..17d9764
--- /dev/null
+++ b/tests/initscripts/bridge-empty.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<forest>
+  <tree path="/files/etc/sysconfig/network-scripts/ifcfg-br0">
+    <node label="DEVICE" value="br0"/>
+    <node label="ONBOOT" value="yes"/>
+    <node label="MTU" value="1500"/>
+    <node label="TYPE" value="Bridge"/>
+    <node label="STP" value="off"/>
+  </tree>
+</forest>
diff --git a/tests/interface/bridge-empty.xml b/tests/interface/bridge-empty.xml
new file mode 100644
index 0000000..5b4523e
--- /dev/null
+++ b/tests/interface/bridge-empty.xml
@@ -0,0 +1,5 @@
+<interface type="bridge" name="br0">
+  <start mode="onboot"/>
+  <mtu size="1500"/>
+  <bridge stp="off"/>
+</interface>
diff --git a/tests/test-initscripts.c b/tests/test-initscripts.c
index cd95e6a..39d0865 100644
--- a/tests/test-initscripts.c
+++ b/tests/test-initscripts.c
@@ -177,6 +177,7 @@ static void testTransforms(CuTest *tc) {
     assert_transforms(tc, "bridge");
     assert_transforms(tc, "bridge-no-address");
     assert_transforms(tc, "bridge-vlan");
+    assert_transforms(tc, "bridge-empty");
     assert_transforms(tc, "ethernet-static");
     assert_transforms(tc, "ethernet-static-no-prefix");
     assert_transforms(tc, "ethernet-dhcp");
-- 
1.6.2.5