tests: testdriver: More network storage examples

tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml

@@ -3,7 +3,7 @@
      </panic>
 +    <disk type="file" device="disk">
 +      <source file="/dev/default-pool/new1.img"/>
-+      <target dev="vdd"/>
++      <target dev="vdae"/>
 +    </disk>
    </devices>
  </domain>

tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml

@@ -3,7 +3,7 @@
      </panic>
 +    <disk type="file" device="disk">
 +      <source file="/dev/default-pool/testvol1.img"/>
-+      <target dev="vdd"/>
++      <target dev="vdae"/>
 +    </disk>
    </devices>
  </domain>

tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml

@@ -9,7 +9,7 @@
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
    <on_crash>restart</on_crash>
-@@ -339,4 +334,5 @@
+@@ -369,4 +364,5 @@
        <address type="isa" iobase="0x505"/>
      </panic>
    </devices>

tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml

@@ -21,7 +21,7 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
      <timer name="pit" tickpolicy="delay"/>
-@@ -339,4 +322,5 @@
+@@ -369,4 +352,5 @@
        <address type="isa" iobase="0x505"/>
      </panic>
    </devices>

tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml

@@ -3,9 +3,10 @@
        <source>
 -        <vendor id="0x04b3"/>
 -        <product id="0x4485"/>
+-      </source>
 +        <vendor id="0x0781"/>
 +        <product id="0x5151"/>
-       </source>
++      </source>
 +      <driver name="vfio"/>
      </hostdev>
      <hostdev mode="subsystem" type="usb" managed="yes">

tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml

@@ -12,7 +12,7 @@
    <memory unit="KiB">409600</memory>
    <currentMemory unit="KiB">204800</currentMemory>
    <blkiotune>
-@@ -339,4 +339,5 @@
+@@ -369,4 +369,5 @@
        <address type="isa" iobase="0x505"/>
      </panic>
    </devices>

tests/testdriver.xml

@@ -181,6 +181,38 @@
       <readonly/>
     </disk>
 
+    <!-- Network disks -->
+    <disk type='network' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source protocol='http' name='/my-file.img'>
+        <host name='example.org'/>
+      </source>
+      <target dev='vdaa' bus='virtio'/>
+    </disk>
+    <disk type='network' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source protocol='nbd'>
+        <host transport='unix' socket='/var/run/nbdsock'/>
+      </source>
+      <target dev='vdab' bus='virtio'/>
+    </disk>
+    <disk type='network' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source protocol='rbd' name='pool/image'>
+        <host name='mon1.example.org' port='6321'/>
+        <host name='mon2.example.org' port='6322'/>
+        <host name='mon3.example.org' port='6322'/>
+      </source>
+      <target dev='vdac' bus='virtio'/>
+    </disk>
+    <disk type='network' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source protocol='sheepdog' name='image,with,commas'>
+        <host name='example.org' port='6000'/>
+      </source>
+      <target dev='vdad' bus='virtio'/>
+    </disk>
+
 
     <!-- interfaces -->
     <interface type='network'>
@@ -1736,8 +1768,29 @@ ba</description>
     <host name='ceph-mon-3.example.com' port='6789'/>
     <name>rbd</name>
   </source>
+
+  <volume>
+    <name>vol1</name>
+    <key>rbd/vol1</key>
+    <capacity unit='bytes'>8302592</capacity>
+    <allocation unit='bytes'>8388608</allocation>
+    <target>
+      <path>rbd/vol1</path>
+    </target>
+  </volume>
+
+  <volume>
+    <name>some-rbd-vol</name>
+    <key>rbd/some-rbd-vol</key>
+    <capacity unit='bytes'>104857600</capacity>
+    <allocation unit='bytes'>104857600</allocation>
+    <target>
+      <path>rbd/some-rbd-vol</path>
+    </target>
+  </volume>
 </pool>
 
+
 <pool type='sheepdog'>
   <name>myshpool</name>
   <uuid>581381f8-a13f-4f7c-89b5-9c9b71c64834</uuid>
@@ -1748,23 +1801,25 @@ ba</description>
     <host name='localhost' port='7000'/>
     <name>mysheeppool</name>
   </source>
+
   <volume type='network'>
-  <name>vol_sheepdog</name>
+    <name>vol_sheepdog</name>
-  <key>sheep/vol_sheepdog</key>
+    <key>sheep/vol_sheepdog</key>
-  <capacity unit='bytes'>1024</capacity>
+    <capacity unit='bytes'>1024</capacity>
-  <allocation unit='bytes'>0</allocation>
+    <allocation unit='bytes'>0</allocation>
-  <target>
+    <target>
-    <path>sheepdog:vol_sheepdog</path>
+      <path>sheepdog:vol_sheepdog</path>
-    <format type='unknown'/>
+      <format type='unknown'/>
-    <permissions>
+      <permissions>
-      <mode>0600</mode>
+        <mode>0600</mode>
-      <owner>4294967295</owner>
+        <owner>4294967295</owner>
-      <group>4294967295</group>
+        <group>4294967295</group>
-    </permissions>
+      </permissions>
     </target>
   </volume>
 </pool>
 
+
 <pool type='gluster'>
   <name>gluster-pool</name>
   <uuid>7b83ef6d-28da-44f1-841f-2011320f13b0</uuid>
@@ -1776,25 +1831,26 @@ ba</description>
     <dir path='/'/>
     <name>test-volume</name>
   </source>
+
   <volume type='network'>
-  <name>test-gluster.raw</name>
+    <name>test-gluster.raw</name>
-  <key>gluster://192.168.1.100/test-volume/test-gluster.raw</key>
+    <key>gluster://192.168.1.100/test-volume/test-gluster.raw</key>
-  <capacity unit='bytes'>10737418240</capacity>
+    <capacity unit='bytes'>10737418240</capacity>
-  <allocation unit='bytes'>2489327616</allocation>
+    <allocation unit='bytes'>2489327616</allocation>
-  <target>
+    <target>
-    <path>gluster://192.168.1.100/test-volume/test-gluster.raw</path>
+      <path>gluster://192.168.1.100/test-volume/test-gluster.raw</path>
-    <format type='raw'/>
+      <format type='raw'/>
-    <permissions>
+      <permissions>
-      <mode>0666</mode>
+        <mode>0666</mode>
-      <owner>0</owner>
+        <owner>0</owner>
-      <group>0</group>
+        <group>0</group>
-    </permissions>
+      </permissions>
-    <timestamps>
+      <timestamps>
-      <atime>1413881655.870313004</atime>
+        <atime>1413881655.870313004</atime>
-      <mtime>1411649104.965642390</mtime>
+        <mtime>1411649104.965642390</mtime>
-      <ctime>1412163870.190503958</ctime>
+        <ctime>1412163870.190503958</ctime>
-    </timestamps>
+      </timestamps>
-  </target>
+    </target>
   </volume>
 </pool>