[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [test-API PATCH 1/4] change testcase config files in cases for new testcases



---
 cases/basic_interface.conf              |    2 +-
 cases/consumption_cpu_topology.conf     |    6 +--
 cases/consumption_domain_nfs_start.conf |    7 +---
 cases/consumption_eventhandler.conf     |    6 +--
 cases/consumption_libvirtd.conf         |    6 +--
 cases/consumption_ownership_test.conf   |    7 +---
 cases/domain_linux_net_inst.conf        |   11 ++----
 cases/linux_domain.conf                 |   48 +++++++++++++------------------
 cases/snapshot.conf                     |    8 ++--
 cases/storage_dir.conf                  |    7 ----
 cases/storage_disk.conf                 |    2 -
 cases/storage_iscsi.conf                |   13 ++++----
 cases/storage_logical.conf              |    5 ---
 cases/storage_mpath.conf                |    2 -
 cases/storage_netfs.conf                |   13 +-------
 cases/storage_scsi.conf                 |    2 -
 cases/windows_domain.conf               |   35 +++++-----------------
 17 files changed, 55 insertions(+), 125 deletions(-)

diff --git a/cases/basic_interface.conf b/cases/basic_interface.conf
index c3a86e0..e2125bb 100644
--- a/cases/basic_interface.conf
+++ b/cases/basic_interface.conf
@@ -10,7 +10,7 @@ interface:define
     ifacename
         $testnic
     ifacetype
-        $testnic
+        ethernet
 
 interface:create
     ifacename
diff --git a/cases/consumption_cpu_topology.conf b/cases/consumption_cpu_topology.conf
index 1d76256..c02ef2a 100644
--- a/cases/consumption_cpu_topology.conf
+++ b/cases/consumption_cpu_topology.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
diff --git a/cases/consumption_domain_nfs_start.conf b/cases/consumption_domain_nfs_start.conf
index f97cda0..13b2449 100644
--- a/cases/consumption_domain_nfs_start.conf
+++ b/cases/consumption_domain_nfs_start.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
@@ -30,4 +28,3 @@ sVirt:domain_nfs_start
 clean
 
 options cleanup=enable
-
diff --git a/cases/consumption_eventhandler.conf b/cases/consumption_eventhandler.conf
index 768d616..07bee07 100644
--- a/cases/consumption_eventhandler.conf
+++ b/cases/consumption_eventhandler.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
diff --git a/cases/consumption_libvirtd.conf b/cases/consumption_libvirtd.conf
index 4eb8f86..b0dfff9 100644
--- a/cases/consumption_libvirtd.conf
+++ b/cases/consumption_libvirtd.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
diff --git a/cases/consumption_ownership_test.conf b/cases/consumption_ownership_test.conf
index 58468fd..a906b39 100644
--- a/cases/consumption_ownership_test.conf
+++ b/cases/consumption_ownership_test.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
@@ -27,4 +25,3 @@ domain:ownership_test
         enable
 
 options cleanup=enable
-
diff --git a/cases/domain_linux_net_inst.conf b/cases/domain_linux_net_inst.conf
index 4c8ab5d..7c97818 100644
--- a/cases/domain_linux_net_inst.conf
+++ b/cases/domain_linux_net_inst.conf
@@ -1,8 +1,6 @@
 domain:install_linux_net
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -13,9 +11,9 @@ domain:install_linux_net
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     type
 	define
@@ -25,9 +23,9 @@ domain:install_linux_check
         $defaultname
     virt_type
         $defaulthv
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
 
 domain:destroy
@@ -37,4 +35,3 @@ domain:destroy
 domain:undefine
     guestname
         $defaultname
-
diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf
index 5059c0d..e7d6bac 100644
--- a/cases/linux_domain.conf
+++ b/cases/linux_domain.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
@@ -23,9 +21,9 @@ domain:install_linux_check
         $defaultname
     virt_type
         $defaulthv
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
 
 domain:shutdown
@@ -47,16 +45,16 @@ domain:undefine
 domain:define
     guestname
         $defaultname
-    virt_type
-        $defaulthv
+    diskpath
+        /var/lib/libvirt/images/libvirt-test-api
     vcpu
-        $defaultvcpu
+        1
     memory
-        $defaultmem
-    hdmodel
-        $defaulthd
-    nicmodel
-        $defaultnic
+        1048576
+    hddriver
+        virtio
+    nicdriver
+        virtio
     macaddr
         54:52:00:45:c3:8a
 
@@ -116,24 +114,18 @@ domain:start
 domain:attach_disk
     guestname
         $defaultname
-    virt_type
-        $defaulthv
-    imagename
-        attacheddisk
-    imagesize
-        1000
-    hdmodel
-        $defaulthd
+    imageformat
+        qcow2
+    hddriver
+        virtio
 
 domain:detach_disk
     guestname
         $defaultname
-    virt_type
-        $defaulthv
-    imagename
-        attacheddisk
-    hdmodel
-        $defaulthd
+    imageformat
+        qcow2
+    hddriver
+        virtio
 
 domain:cpu_affinity
     guestname
diff --git a/cases/snapshot.conf b/cases/snapshot.conf
index 0557c86..4aac68b 100644
--- a/cases/snapshot.conf
+++ b/cases/snapshot.conf
@@ -1,8 +1,6 @@
 domain:install_linux_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,12 +9,14 @@ domain:install_linux_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         $defaulthd
-    nicmodel
+    nicdriver
         $defaultnic
     macaddr
         54:52:00:45:c3:8a
+    imageformat
+        qcow2
 
 domain:shutdown
     guestname
diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf
index 5bfc491..dcac700 100644
--- a/cases/storage_dir.conf
+++ b/cases/storage_dir.conf
@@ -1,10 +1,6 @@
 storage:define_dir_pool
     poolname
         $defaultpoolname
-    pooltype
-        dir
-    targetpath
-        $defaultpoolpath
 
 storage:build_dir_pool
     poolname
@@ -41,10 +37,7 @@ storage:undefine_pool
 storage:create_dir_pool
     poolname
         $defaultpoolname
-    pooltype
-        dir
 
 storage:destroy_pool
     poolname
         $defaultpoolname
-
diff --git a/cases/storage_disk.conf b/cases/storage_disk.conf
index f758652..d787b77 100644
--- a/cases/storage_disk.conf
+++ b/cases/storage_disk.conf
@@ -1,8 +1,6 @@
 storage:define_disk_pool
     poolname
         $defaultpoolname
-    pooltype
-        disk
     sourcepath
         $defaultdisk
 
diff --git a/cases/storage_iscsi.conf b/cases/storage_iscsi.conf
index 7506f13..8ce7da4 100644
--- a/cases/storage_iscsi.conf
+++ b/cases/storage_iscsi.conf
@@ -1,9 +1,11 @@
+storage:destroy_pool
+    poolname
+        $defaultpoolname
+
 storage:define_iscsi_pool
     poolname
         $defaultpoolname
-    pooltype
-        iscsi
-    sourcename
+    sourcehost
         $iscsi_server
     sourcepath
         $iscsi_target
@@ -23,9 +25,7 @@ storage:undefine_pool
 storage:create_iscsi_pool
     poolname
         $defaultpoolname
-    pooltype
-        iscsi
-    sourcename
+    sourcehost
         $iscsi_server
     sourcepath
         $iscsi_target
@@ -33,4 +33,3 @@ storage:create_iscsi_pool
 storage:destroy_pool
     poolname
         $defaultpoolname
-
diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf
index baaa4a5..3334abd 100644
--- a/cases/storage_logical.conf
+++ b/cases/storage_logical.conf
@@ -1,8 +1,6 @@
 storage:define_logical_pool
     poolname
         $defaultpoolname
-    pooltype
-        logical
     sourcename
         $defaultpoolname
     sourcepath
@@ -19,8 +17,6 @@ storage:activate_pool
 storage:create_logical_volume
     poolname
         $defaultpoolname
-    pooltype
-        logical
     volname
         $defaultvolumename
     capacity
@@ -43,4 +39,3 @@ storage:delete_logical_pool
 storage:undefine_pool
     poolname
         $defaultpoolname
-
diff --git a/cases/storage_mpath.conf b/cases/storage_mpath.conf
index 569acdf..4b0f7e2 100644
--- a/cases/storage_mpath.conf
+++ b/cases/storage_mpath.conf
@@ -1,8 +1,6 @@
 storage:define_mpath_pool
     poolname
         $defaultpoolname
-    pooltype
-        mpath
 
 storage:activate_pool
     poolname
diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf
index 9e17587..e764813 100644
--- a/cases/storage_netfs.conf
+++ b/cases/storage_netfs.conf
@@ -1,15 +1,10 @@
 storage:define_netfs_pool
     poolname
         $defaultpoolname
-    pooltype
-        netfs
-    sourcename
+    sourcehost
         $nfs_server
     sourcepath
         $nfs_folder
-    targetpath
-        /tmp/netfs
-
 
 storage:build_netfs_pool
     poolname
@@ -46,14 +41,10 @@ storage:undefine_pool
 storage:create_netfs_pool
     poolname
         $defaultpoolname
-    pooltype
-        netfs
-    sourcename
+    sourcehost
         $nfs_server
     sourcepath
         $nfs_folder
-    targetpath
-        /tmp/netfs
 
 storage:destroy_pool
     poolname
diff --git a/cases/storage_scsi.conf b/cases/storage_scsi.conf
index efc94eb..00ae6a2 100644
--- a/cases/storage_scsi.conf
+++ b/cases/storage_scsi.conf
@@ -1,8 +1,6 @@
 storage:define_scsi_pool
     poolname
         $defaultpoolname
-    pooltype
-        scsi
     sourcename
         $defaultscsiname
 
diff --git a/cases/windows_domain.conf b/cases/windows_domain.conf
index 6eed3f5..68396a0 100644
--- a/cases/windows_domain.conf
+++ b/cases/windows_domain.conf
@@ -1,8 +1,6 @@
 domain:install_windows_cdrom
     guestname
         $defaultname
-    virt_type
-        $defaulthv
     guestos
         $defaultos
     guestarch
@@ -11,9 +9,9 @@ domain:install_windows_cdrom
         $defaultvcpu
     memory
         $defaultmem
-    hdmodel
+    hddriver
         ide
-    nicmodel
+    nicdriver
         e1000
 
 domain:shutdown
@@ -93,23 +91,17 @@ domain:start
 domain:attach_disk
     guestname
         $defaultname
-    virt_type
-        $defaulthv
-    imagename
-        attacheddisk
-    imagesize
-        1000
-    hdmodel
+    imageformat
+        qcow2
+    hddriver
         virtio
 
 domain:detach_disk
     guestname
         $defaultname
-    virt_type
-        $defaulthv
-    imagename
-        attacheddisk
-    hdmodel
+    imageformat
+        qcow2
+    hddriver
         virtio
 
 domain:cpu_affinity
@@ -131,14 +123,3 @@ domain:destroy
 domain:undefine
     guestname
         $defaultname
-
-
-
-
-
-
-
-
-
-
-
-- 
1.7.7.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]