From dbb6f338ab37b6b3ef65df5c2f3dea191ca5ddd5 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 15 May 2019 15:54:28 -0400
Subject: [PATCH] tests: clitest: Cover all --vsock options and aliases

---
 .../compare/virt-install-singleton-config-3.xml       |  3 +++
 .../compare/virt-xml-edit-simple-vsock.xml            | 11 +++++++++++
 tests/clitest.py                                      |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml

diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
index 98e34239b..11faeec9a 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
@@ -72,5 +72,8 @@
     <panic model="isa">
       <address type="isa" iobase="0x500" irq="5"/>
     </panic>
+    <vsock model="virtio">
+      <cid auto="yes"/>
+    </vsock>
   </devices>
 </domain>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml
new file mode 100644
index 000000000..4fea668c4
--- /dev/null
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml
@@ -0,0 +1,11 @@
+       <driver intremap="off" iotlb="on"/>
+     </iommu>
+     <vsock model="virtio">
+-      <cid auto="no" address="5"/>
++      <cid auto="yes"/>
+     </vsock>
+   </devices>
+   <seclabel type="dynamic" model="selinux" relabel="yes"/>
+
+Domain 'test-for-virtxml' defined successfully.
+Changes will take effect after the domain is fully powered off.
\ No newline at end of file
diff --git a/tests/clitest.py b/tests/clitest.py
index 936a51dab..5b1f94b9a 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -490,6 +490,7 @@ c.add_compare("""
 --rng egd,backend.type=nmdm,backend.source.master=/dev/foo1,backend.source.slave=/dev/foo2
 --panic default,,address.type=isa,address.iobase=0x500,address.irq=5
 --cpu topology.sockets=1,topology.cores=3,topology.threads=2
+--vsock auto_cid=on
 """, "singleton-config-3")
 
 
@@ -1003,6 +1004,7 @@ c.add_compare("--controller index=15,model=lsilogic", "edit-simple-controller")
 c.add_compare("--smartcard type=spicevmc", "edit-simple-smartcard")
 c.add_compare("--redirdev type=spicevmc,server=example.com:12345", "edit-simple-redirdev")
 c.add_compare("--tpm backend.device.path=,backend.type=emulator,backend.version=2.0", "edit-simple-tpm", check_version="1.3.5")  # check_version=new graphics listen output
+c.add_compare("--vsock model=virtio,cid.address=,cid.auto=on", "edit-simple-vsock")
 c.add_compare("--rng rate_bytes=3333,rate_period=4444", "edit-simple-rng")
 c.add_compare("--watchdog action=reset", "edit-simple-watchdog")
 c.add_compare("--memballoon model=none", "edit-simple-memballoon")