storage: change custom namespace URIs to drop '/source' component

The custom namespaces were originally registered against the storage
pool source struct, but during review this was changed to the top level
storage pool struct. The namespace URIs were not updated to match, so
had a redundant '/source' component.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index d19bc579a437b3e2219c9841c339e75529ed693d..6ebd23549ff9c0f3efb4ebf8bef90338cd680731 100644 (file)
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -535,7 +535,7 @@
         provide the XML namespace attribute syntax as follows:
 
         <p>
-        xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'
+        xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'
         </p>
 
         <p>
@@ -551,7 +551,7 @@
         The following XML snippet shows the syntax required in order to
         utilize for a netfs pool:
       <pre>
-&lt;pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'&gt;
+&lt;pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'&gt;
   &lt;name&gt;nfsimages&lt;/name&gt;
 ...
   &lt;source&gt;
@@ -580,7 +580,7 @@
         syntax as follows:
 
         <p>
-        xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'
+        xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'
         </p>
 
         <p>
@@ -598,7 +598,7 @@
         The following XML snippet shows the syntax required in order to
         utilize
       <pre>
-&lt;pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'&gt;
+&lt;pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'&gt;
   &lt;name&gt;myrbdpool&lt;/name&gt;
 ...
   &lt;source&gt;

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index e1944ff8e180b8b87151f0652107f47b7715debb..3907f70afe50510d63681f8de6908ec6882771b3 100644 (file)
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -697,7 +697,7 @@
     -->
 
   <define name="fs_mount_opts">
-    <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/source/fs/1.0">
+    <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/fs/1.0">
       <zeroOrMore>
         <element name="option">
           <attribute name='name'>
@@ -714,7 +714,7 @@
     -->
 
   <define name="rbd_config_opts">
-    <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/source/rbd/1.0">
+    <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/rbd/1.0">
       <zeroOrMore>
         <element name="option">
           <attribute name='name'>

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 0ec99c60ed766ec30e21e277576215881904d1ec..ddb422d8744a9590c0db959c7253777aecd2c521 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool,
 
 #if WITH_STORAGE_FS
 
-# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/fs/1.0"
+# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0"
 
 /* Backend XML Namespace handling for fs or netfs specific mount options to
  * be added to the mount -o {options_list} command line that are not otherwise

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2348f80146e7016b408f69c5c4fc8f31b4315066..cfbce1ad196aa2a3d659c27a55cf5304a30eadf1 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef {
     char **values;
 };
 
-#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/rbd/1.0"
+#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0"
 
 static void
 virStoragePoolDefRBDNamespaceFree(void *nsdata)

diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
index 0434b16eb73d7008144062d0dcfb3e33997905da..c2777ed29d753079eb16ecba7d8f840e6b96cdd3 100644 (file)
--- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
   <name>nfsimages</name>
   <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
   <capacity>0</capacity>

diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
index 6b62aa6f7e65b74e26b66ec4c6278e4bf678d388..a924fc103d7d6b5b3861773754293d06bff95551 100644 (file)
--- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
   <name>ceph</name>
   <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
   <source>

diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
index 4bd164f2206f25581bad887b7961d7c39ebb3ba1..fdc332087f2f3a9aedccbd39274a786da5cd3509 100644 (file)
--- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
   <name>nfsimages</name>
   <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
   <capacity unit='bytes'>0</capacity>

diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
index 342a0ff74a93283ac7ddde2c984f7d82e1e6ac86..7fbcc3e0bc5392118a536397007646b1a2451759 100644 (file)
--- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
   <name>ceph</name>
   <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
   <capacity unit='bytes'>0</capacity>