提交 38c94948 编写于 作者: J John Ferlan

storage: Fix the schema and add tests for cifs pool

Commit id '887dd362' added support for a netfs pool format type 'cifs'
and 'gluster' in order to add rng support for Samba and glusterfs netfs
pools. Originally, the CIFS type support was added as part of commit
id '61fb6979'. Eventually commit id 'b325be12' fixed the gluster rng
definition to match expectations.

As it turns out the CIFS rng needed a similar change since the directory
path is not an absDirPath, rather just a dirPath will be required.
上级 ecb9a7a1
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
</element> </element>
</define> </define>
<define name='sourceinfonetfsgluster'> <define name='sourceinfonetrelativepath'>
<element name='dir'> <element name='dir'>
<attribute name='path'> <attribute name='path'>
<ref name='dirPath'/> <ref name='dirPath'/>
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
<choice> <choice>
<value>auto</value> <value>auto</value>
<value>nfs</value> <value>nfs</value>
<value>cifs</value>
</choice> </choice>
</attribute> </attribute>
</element> </element>
...@@ -488,10 +487,13 @@ ...@@ -488,10 +487,13 @@
<group> <group>
<interleave> <interleave>
<ref name='sourceinfohost'/> <ref name='sourceinfohost'/>
<ref name='sourceinfonetfsgluster'/> <ref name='sourceinfonetrelativepath'/>
<element name='format'> <element name='format'>
<attribute name='type'> <attribute name='type'>
<value>glusterfs</value> <choice>
<value>cifs</value>
<value>glusterfs</value>
</choice>
</attribute> </attribute>
</element> </element>
<optional> <optional>
......
<pool type='netfs'>
<source>
<host name='example.com'/>
<format type='cifs'/>
<dir path='samba_share'/>
</source>
<name>netfs-cifs</name>
<uuid>d5609ced-94b1-489e-b218-eff35c30336a</uuid>
<target>
<path>/mnt/cifs</path>
</target>
</pool>
<pool type='netfs'>
<name>netfs-cifs</name>
<uuid>d5609ced-94b1-489e-b218-eff35c30336a</uuid>
<capacity unit='bytes'>0</capacity>
<allocation unit='bytes'>0</allocation>
<available unit='bytes'>0</available>
<source>
<host name='example.com'/>
<dir path='samba_share'/>
<format type='cifs'/>
</source>
<target>
<path>/mnt/cifs</path>
</target>
</pool>
...@@ -84,6 +84,7 @@ mymain(void) ...@@ -84,6 +84,7 @@ mymain(void)
DO_TEST("pool-iscsi-auth"); DO_TEST("pool-iscsi-auth");
DO_TEST("pool-netfs"); DO_TEST("pool-netfs");
DO_TEST("pool-netfs-gluster"); DO_TEST("pool-netfs-gluster");
DO_TEST("pool-netfs-cifs");
DO_TEST("pool-scsi"); DO_TEST("pool-scsi");
DO_TEST("pool-scsi-type-scsi-host"); DO_TEST("pool-scsi-type-scsi-host");
DO_TEST("pool-scsi-type-fc-host"); DO_TEST("pool-scsi-type-fc-host");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册