Ovirt devel - Jul 2009 - [PATCH node-image] Removes the explicit setting of the emulator for testing.

Instead, the script lets libvirt determine which emulator to use.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 autotest.sh |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index c9f8a2d..96a15b5 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -270,7 +270,6 @@ define_node () {
     # flexible options
     # define defaults, then allow the caller to override them as needed
     local arch=$(uname -i)
-    local emulator=$(which qemu-kvm)
     local serial="true"
     local vncport="-1"
     local bootdev='hd'
@@ -281,7 +280,7 @@ define_node () {
     if [ -n "$options" ]; then eval "$options"; fi
 
     debug "define_node ()"
-    for var in filename nodename memory harddrive cddrive bridge options arch
emulator serial vncport bootdev; do
+    for var in filename nodename memory harddrive cddrive bridge options arch
serial vncport bootdev; do
 eval debug "::$var: \$$var"
     done
 
@@ -305,7 +304,6 @@ eval debug "::$var: \$$var"
 
     # add devices
     result="${result}\n<devices>"
-    result="${result}\n<emulator>${emulator}</emulator>"
     # inject the hard disk if defined
     if [ -n "$harddrive" ]; then
         debug "Adding a hard drive to the node"
@@ -566,7 +564,7 @@ test_stateful_pxe () {
     start_networking $nodename $IFACE_NAME false true $workdir
 
     configure_node "${nodename}" "network" ""
"10000" "" "local noapic=true"
-    boot_with_pxe "${nodename}" "standalone
storage_init=/dev/vda local_boot ip=${ipaddress}" ${workdir}
+    boot_with_pxe "${nodename}" "standalone
storage_init=/dev/vda local_boot ip=${ipaddress} vlan=12" ${workdir}
 
     # verify the booting and installation
     expect -c '
-- 
1.6.2.5

On Thu, Jul 16, 2009 at 10:35:10AM -0400, Darryl L. Pierce
wrote:
> Instead, the script lets libvirt determine which emulator to use.
> 
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  autotest.sh |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/autotest.sh b/autotest.sh
> index c9f8a2d..96a15b5 100755
> --- a/autotest.sh
> +++ b/autotest.sh
> @@ -270,7 +270,6 @@ define_node () {
>      # flexible options
>      # define defaults, then allow the caller to override them as needed
>      local arch=$(uname -i)
> -    local emulator=$(which qemu-kvm)
>      local serial="true"
>      local vncport="-1"
>      local bootdev='hd'
> @@ -281,7 +280,7 @@ define_node () {
>      if [ -n "$options" ]; then eval "$options"; fi
>  
>      debug "define_node ()"
> -    for var in filename nodename memory harddrive cddrive bridge options
arch emulator serial vncport bootdev; do
> +    for var in filename nodename memory harddrive cddrive bridge options
arch serial vncport bootdev; do
>  eval debug "::$var: \$$var"
>      done
>  
> @@ -305,7 +304,6 @@ eval debug "::$var: \$$var"
>  
>      # add devices
>      result="${result}\n<devices>"
> -   
result="${result}\n<emulator>${emulator}</emulator>"
>      # inject the hard disk if defined
>      if [ -n "$harddrive" ]; then
>          debug "Adding a hard drive to the node"
> @@ -566,7 +564,7 @@ test_stateful_pxe () {
>      start_networking $nodename $IFACE_NAME false true $workdir
>  
>      configure_node "${nodename}" "network"
"" "10000" "" "local noapic=true"
> -    boot_with_pxe "${nodename}" "standalone
storage_init=/dev/vda local_boot ip=${ipaddress}" ${workdir}
> +    boot_with_pxe "${nodename}" "standalone
storage_init=/dev/vda local_boot ip=${ipaddress} vlan=12" ${workdir}
Think this was part of something separate, not this patch.
>  
>      # verify the booting and installation
>      expect -c '
> -- 
> 1.6.2.5
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
> 
ACK if vlan=12 is removed

Mike