From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 20 Apr 2017 14:41:17 +0000 (+0200)
Subject: docs: schemas: Extract HTTP disk source specification
X-Git-Tag: v3.3.0-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde5c2f532190109cd15eb69bec8cd3beee1d595;p=thirdparty%2Flibvirt.git

docs: schemas: Extract HTTP disk source specification

Make the schema more strict for HTTP disks requiring a name and
mandating exactly one source host.

ftp/tftp entries were not moved here, since http transport also will
support cookies and other options, which will be added later.
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index add2910652..c6b6219cb4 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1556,6 +1556,19 @@
     </element>
   </define>
 
+  <define name="diskSourceNetworkProtocolHTTP">
+    <element name="source">
+      <attribute name="protocol">
+        <choice>
+          <value>http</value>
+          <value>https</value>
+        </choice>
+      </attribute>
+      <attribute name="name"/>
+      <ref name="diskSourceNetworkHost"/>
+    </element>
+  </define>
+
   <define name="diskSourceNetworkProtocolGeneric">
     <element name="source">
       <interleave>
@@ -1565,8 +1578,6 @@
             <value>sheepdog</value>
             <value>gluster</value>
             <value>iscsi</value>
-            <value>http</value>
-            <value>https</value>
             <value>ftp</value>
             <value>ftps</value>
             <value>tftp</value>
@@ -1589,6 +1600,7 @@
     <choice>
       <ref name="diskSourceNetworkProtocolGeneric"/>
       <ref name="diskSourceNetworkProtocolRBD"/>
+      <ref name="diskSourceNetworkProtocolHTTP"/>
     </choice>
   </define>