From 2fc7e4a25a4ca72bce4dae7452531e43ecf80d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 14 Jan 2015 10:51:52 +0100
Subject: [PATCH] Move network route definition to networkcommon.rng

Moving network route to the network common schema will allow reusing it.
---
 docs/schemas/network.rng       | 20 +-------------------
 docs/schemas/networkcommon.rng | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 9a7d156303..63d81c133a 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -371,25 +371,7 @@
         </zeroOrMore>
         <!-- <route> element -->
         <zeroOrMore>
-          <!-- The (static) route element specifies a network address and gateway
-               address to access that network. Both the network address and
-               the gateway address must be specified. -->
-          <element name="route">
-            <optional>
-              <attribute name="family"><ref name="addr-family"/></attribute>
-            </optional>
-            <attribute name="address"><ref name="ipAddr"/></attribute>
-            <optional>
-              <choice>
-                <attribute name="netmask"><ref name="ipv4Addr"/></attribute>
-                <attribute name="prefix"><ref name="ipPrefix"/></attribute>
-              </choice>
-            </optional>
-            <attribute name="gateway"><ref name="ipAddr"/></attribute>
-            <optional>
-              <attribute name="metric"><ref name="unsignedInt"/></attribute>
-            </optional>
-          </element>
+          <ref name="routex"/>
         </zeroOrMore>
       </interleave>
     </element>
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
index e26b7f30b9..cbcae91f01 100644
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -224,4 +224,26 @@
       <param name='maxInclusive'>65535</param>
     </data>
   </define>
+
+  <!-- The (static) route element specifies a network address and gateway
+       address to access that network. Both the network address and
+       the gateway address must be specified. -->
+  <define name='routex'>
+    <element name="route">
+      <optional>
+        <attribute name="family"><ref name="addr-family"/></attribute>
+      </optional>
+      <attribute name="address"><ref name="ipAddr"/></attribute>
+      <optional>
+        <choice>
+          <attribute name="netmask"><ref name="ipv4Addr"/></attribute>
+          <attribute name="prefix"><ref name="ipPrefix"/></attribute>
+        </choice>
+      </optional>
+      <attribute name="gateway"><ref name="ipAddr"/></attribute>
+      <optional>
+        <attribute name="metric"><ref name="unsignedInt"/></attribute>
+      </optional>
+    </element>
+  </define>
 </grammar>