Merge remote branch 'cros/upstream' into tempbranch

client/tests/kvm/tests_base.cfg.sample

 # Copy this file to tests_base.cfg and edit it.
 #
 # Define the objects we'll be using
 vms = vm1
 images = image1
 cdroms = cd1
 nics = nic1
 monitors = humanmonitor1
 
 # Choose the main VM and monitor
@@ skipping 17 matching lines @@
 screendump_temp_dir = /dev/shm
 screendump_verbose = no
 
 # Some default VM params
 qemu_binary = qemu
 qemu_img_binary = qemu-img
 smp = 1
 mem = 512
 image_size = 10G
 drive_index_image1 = 0
+drive_cache = none
 shell_port = 22
 display = vnc
 drive_index_cd1 = 1
 
 # Monitor params
 monitor_type = human
 
 # Default scheduler params
 used_cpus = 1
 used_mem = 512
 
 # Port redirections
 redirs = remote_shell
 guest_port_remote_shell = 22
 
 # NIC parameters
 nic_mode = user
 #nic_mode = tap
 nic_script = scripts/qemu-ifup
-address_index = 0
+#nic_script = scripts/qemu-ifup-ipv6
 run_tcpdump = yes
 
 # Misc
 profilers = kvm_stat
 login_timeout = 360
 
 
 # Tests
 variants:
     - install:
@@ skipping 199 matching lines @@
 
     - balloon_check:  install setup unattended_install.cdrom
         type = balloon_check
         extra_params += " -balloon virtio"
         iterations = 5
 
     - stress_boot:  install setup unattended_install.cdrom
         type = stress_boot
         max_vms = 5    
         alive_test_cmd = uname -a
-        clone_address_index_base = 10
         login_timeout = 240
         kill_vm = yes
         kill_vm_vm1 = no
         kill_vm_gracefully = no
         extra_params += " -snapshot"
         used_cpus = 5
         used_mem = 2560
 
     - guest_test:       install setup unattended_install.cdrom
         type = guest_test
@@ skipping 161 matching lines @@
                 match_string = "Virtio block device"
             - block_scsi:
                 pci_model = scsi
                 match_string = "SCSI"
         variants:
             - fmt_qcow2:
                 image_format_stg = qcow2
             - fmt_raw:
                 image_format_stg = raw
 
-    - vlan_tag:  install setup unattended_install.cdrom
-        type = vlan_tag
+    - qmp_basic: install setup unattended_install.cdrom
+        type = qmp_basic
+
+    - vlan:  install setup unattended_install.cdrom
+        type = vlan
         # subnet should not be used by host
-        subnet = 192.168.123
-        vlans = "10 20"
+        subnet = "192.168"
+        vlan_num = 5
+        file_size = 10
+        maximal = 4094
+        listen_cmd = "nc -l %s > %s"
+        send_cmd = "nc %s %s < %s"
         nic_mode = tap
         vms += " vm2"
-        extra_params_vm1 += " -snapshot"
-        extra_params_vm2 += " -snapshot"
+        image_snapshot = yes
+        kill_vm_vm2 = yes
         kill_vm_gracefully_vm2 = no
-        address_index_vm2 = 1
+
+    - ping: install setup unattended_install.cdrom
+        type = ping
+        counts = 100
+        flood_minutes = 10
+
+    - jumbo: install setup unattended_install.cdrom
+        type = jumbo
+
+    - file_transfer: install setup unattended_install.cdrom
+        type = file_transfer
+        filesize = 4000
+        transfer_timeout = 1000
+        variants:
+            - remote:
+                transfer_type = remote
+
+    - nicdriver_unload:  install setup unattended_install.cdrom
+        type = nicdriver_unload
+        nic_mode = tap
+        file_size = 100
+        connect_time = 4
+        scp_timeout = 300
+        thread_num = 10
+
+    - nic_promisc:  install setup unattended_install.cdrom
+        type = nic_promisc
+        file_size = 1, 1460, 65000, 100000000
+
+    - multicast: install setup unattended_install.cdrom
+        type = multicast
+        nic_mode = tap
+        mcast = 225.0.0.1
+        mgroup_count = 20
+        flood_minutes = 1
+
+    - pxe:
+        type = pxe
+        images = pxe
+        image_name_pxe = pxe-test
+        image_size_pxe = 1G
+        force_create_image_pxe = yes
+        remove_image_pxe = yes
+        extra_params += ' -boot n'
+        kill_vm_on_error = yes
+        network = bridge
+        restart_vm = yes
+        pxe_timeout = 60
+
+    - mac_change: install setup unattended_install.cdrom
+        type = mac_change
+        kill_vm = yes
+
+    - netperf: install setup unattended_install.cdrom
+        type = netperf
+        nic_mode = tap
+        netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch
+        setup_cmd = "cd %s && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure && make"
+        netserver_cmd =  %s/netperf-2.4.5/src/netserver
+        # test time is 60 seconds, set the buffer size to 1 for more hardware interrupt
+        netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m 1
+        protocols = "TCP_STREAM TCP_MAERTS TCP_RR TCP_CRR UDP_RR TCP_SENDFILE UDP_STREAM"
+
+    - ethtool: install setup unattended_install.cdrom
+        type = ethtool
+        filesize = 512
+        nic_mode = tap
 
     - physical_resources_check: install setup unattended_install.cdrom
         type = physical_resources_check
         catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
 
     - ksm_overcommit:
         # Don't preprocess any vms as we need to change its params
         vms = ''
         image_snapshot = yes
         kill_vm_gracefully = no
@@ skipping 131 matching lines @@
         shutdown_method = shell
         kill_vm = yes
         kill_vm_gracefully = no
     # Do not define test variants below shutdown
 
 
 # NICs
 variants:
     - @rtl8139:
         nic_model = rtl8139
+        jumbo:
+            mtu = 1500
     - e1000:
         nic_model = e1000
+        jumbo:
+            mtu = 16110
+        ethtool:
+                # gso gro lro is only supported by latest kernel
+                supported_features = "tx rx sg tso gso gro lro"
     - virtio_net:
         nic_model = virtio
-
+        # You can add advanced attributes on nic_extra_params such as mrg_rxbuf
+        #nic_extra_params =
+        # You can set vhost = yes to enable the vhost kernel backend
+        # (This only works if nic_mode=tap)
+        vhost = no
+        jumbo:
+            mtu = 65520
+        ethtool:
+            supported_features = "tx sg tso gso"
 
 # Guests
 variants:
     # Linux section
     - @Linux:
         no autoit iozone_windows whql
         shutdown_command = shutdown -h now
         reboot_command = shutdown -r now
         status_test_command = echo $?
         username = root
@@ skipping 22 matching lines @@
             host_load_command = "bzip2 -c --best /dev/urandom > /dev/null"
             host_load_instances = 8
             ntp:
                 time_command = "ntpdate -d -q ns1.nay.redhat.com"
                 time_filter_re = "originate timestamp:.*, (.\w+\s+\d+\s+\d+\s+\d+:\d+:\d+)\.(.\d+)"
                 time_format = "%b %d %Y %H:%M:%S"
             date:
                 time_command = date +'TIME: %a %m/%d/%Y %H:%M:%S.%N'
                 time_filter_re = "(?:TIME: \w\w\w )(.{19})(?:\.\d\d)"
                 time_format = "%m/%d/%Y %H:%M:%S"
+        file_transfer:
+            tmp_dir = /tmp/
+            clean_cmd = rm -f
 
         variants:
             - Fedora:
                 no setup
                 shell_prompt = "^\[.*\][\#\$]\s*$"
                 unattended_install.cdrom:
                     pxe_dir = "images/pxeboot"
                     pxe_image = "vmlinuz"
                     pxe_initrd = "initrd.img"
                     tftp = "images/tftpboot"
@@ skipping 171 matching lines @@
                 no setup
                 shell_prompt = ".*:.*\s#"
                 unattended_install.cdrom:
                     pxe_image = "linux"
                     pxe_initrd = "initrd"
                     tftp = "images/tftpboot"
                     bootp = "/pxelinux.0"
                     extra_params += " -boot cn"
                     # You have to use autoyast=floppy if you want to use floppies to
                     # hold your autoyast file
-                    #kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
-                    kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
+                    kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
+                    #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
                     post_install_delay = 10
 
                 variants:
                     - 11.0.32:
                         image_name = openSUSE-11.0-32
                         cdrom_cd1 = linux/openSUSE-11.0-DVD-i386.iso
                         md5sum = ed6a5b3feb668866df812b1c2aed9d7f
                         md5sum_1m = c720b30557af758e69de450409516369
                         install:
                             steps = openSUSE-11.0-32.steps
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-0-32/tftpboot
-                            floppy = images/opensuse-11-0-32/floppy.img
+                            floppy = images/opensuse-11-0-32/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-0-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.0.64:
                         image_name = openSUSE-11.0-64
                         cdrom_cd1 = linux/openSUSE-11.0-DVD-x86_64.iso
                         md5sum = 512c8346b0f8eb35f28c4eb96454d391
                         md5sum_1m = 661aa4cd031df2f25ea0102318a3f4d1
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-0-64/tftpboot
-                            #floppy = images/opensuse-11-0-64/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
+                            floppy = images/opensuse-11-0-64/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
                     - 11.1.32:
                         image_name = openSUSE-11.1-32
                         cdrom_cd1 = linux/openSUSE-11.1-DVD-i586.iso
                         md5sum = 8f51b278c0415be28c5699e465444bd3
                         md5sum_1m = b70217417468389083429f81ba7ce2bd
                         install:
                             steps=openSUSE-11.1-32-and-64.steps
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-1-32/tftpboot
-                            #floppy = images/opensuse-11-1-32/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
+                            floppy = images/opensuse-11-1-32/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.1.64:
                         image_name = openSUSE-11.1-64
                         cdrom_cd1 = linux/openSUSE-11.1-DVD-x86_64.iso
                         md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8
                         md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0
                         install:
                             steps=openSUSE-11.1-32-and-64.steps
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-1-64/tftpboot
-                            #floppy = images/opensuse-11-1-64/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
+                            floppy = images/opensuse-11-1-64/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
                     - 11.2.32:
                         image_name = openSUSE-11.2-32
                         cdrom_cd1 = linux/openSUSE-11.2-DVD-i586.iso
                         md5sum = 295d713314a30ad017948f0d542c6d92
                         md5sum_1m = 1f8767d00acb492be5a5627c834e543f
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-2-32/tftpboot
-                            #floppy = images/opensuse-11-2-32/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
+                            floppy = images/opensuse-11-2-32/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.2.64:
                         image_name = openSUSE-11.2-64
                         cdrom_cd1 = linux/openSUSE-11.2-DVD-x86_64.iso
                         md5sum = 6a09295e34dc030319d040f67f4742c6
                         md5sum_1m = 11fd11d39744450b898f04c371dde2e7
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-2-64/tftpboot
-                            #floppy = images/opensuse11-2-64/autoyast.vfd
-                            cdrom_unattended = images/opensuse11-2-64/autoyast.iso
+                            floppy = images/opensuse11-2-64/autoyast.vfd
+                            #cdrom_unattended = images/opensuse11-2-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
                     - 11.3.32:
                         image_name = openSUSE-11.3-32
                         cdrom_cd1 = linux/openSUSE-11.3-DVD-i586.iso
                         md5sum = 1a1da28c84e3cdad750d5cfa21c4fd17
                         md5sum_1m = 4dd26906ce6cb3946519cb0b0de4b0f8
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-3-32/tftpboot
-                            #floppy = images/opensuse-11-3-32/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
+                            floppy = images/opensuse-11-3-32/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.3.64:
                         image_name = openSUSE-11.3-64
                         cdrom_cd1 = linux/openSUSE-11.3-DVD-x86_64.iso
                         md5sum = adf5d2a0a03c1e3aaf102fd6a4771b87
                         md5sum_1m = e0dd12dac30d296417256775e1234c6e
                         unattended_install.cdrom:
                             unattended_file = unattended/OpenSUSE-11.xml
                             tftp = images/opensuse-11-3-64/tftpboot
-                            #floppy = images/opensuse-11-3-64/autoyast.vfd
-                            cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
+                            floppy = images/opensuse-11-3-64/autoyast.vfd
+                            #cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
             - SLES:
                 shell_prompt = "^root@.*[\#\$]\s*$|#"
                 unattended_install.cdrom:
                     pxe_image = "linux"
                     pxe_initrd = "initrd"
                     bootp = "/pxelinux.0"
                     extra_params += " -boot cn"
                     # You have to use autoyast=floppy if you want to use floppies to
                     # hold your autoyast file
-                    #kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
-                    kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
+                    kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
+                    #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
                     post_install_delay = 10
 
                 variants:
                     - 11.0.32:
                         image_name = sles11-32
                         cdrom_cd1 = linux/SLES-11-DVD-i586-GM-DVD1.iso
                         md5sum = 4958d4dde2575666355c8a1c5858bab0
                         md5sum_1m = 1f19d4eff5bcead2a3e5b8b4212b6796
                         unattended_install.cdrom:
                             unattended_file = unattended/SLES-11.xml
                             tftp = images/sles-11-0-32/tftpboot
                             #floppy = images/sles-11-0-32/autoyast.vfd
                             cdrom_unattended = images/sles-11-0-32/autoyast.iso
+                            floppy = images/sles-11-0-32/autoyast.vfd
+                            #cdrom_unattended = images/sles-11-0-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.0.64:
                         image_name = sles11-64
                         cdrom_cd1 = linux/SLES-11-DVD-x86_64-GM-DVD1.iso
                         md5sum = 50a2bd45cd12c3808c3ee48208e2586b
                         md5sum_1m = 00000951cab7c32e332362fc424c1054
                         unattended_install.cdrom:
                             unattended_file = unattended/SLES-11.xml
                             tftp = images/sles-11-0-64/tftpboot
-                            #floppy = images/sles-11-0-64/autoyast.vfd
-                            cdrom_unattended = images/sles-11-0-64/autoyast.iso
+                            floppy = images/sles-11-0-64/autoyast.vfd
+                            #cdrom_unattended = images/sles-11-0-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
                     - 11.1.32:
                         image_name = sles11sp1-32
                         cdrom_cd1 = linux/SLES-11-SP1-DVD-i586-GM-DVD1.iso
                         md5sum = 0dd6886858d93501c38854552b9b1b0d
                         md5sum_1m = a626a3d50813410e3ac42794e05773bb
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
                             tftp = images/sles-11-1-32/tftpboot
-                            #floppy = images/sles-11-1-32/autoyast.vfd
-                            cdrom_unattended = images/sles-11-1-32/autoyast.iso
+                            floppy = images/sles-11-1-32/autoyast.vfd
+                            #cdrom_unattended = images/sles-11-1-32/autoyast.iso
                             pxe_dir = boot/i386/loader
 
                     - 11.1.64:
                         image_name = sles11sp1-64
                         cdrom_cd1 = linux/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso
                         md5sum = d2e10420f3689faa49a004b60fb396b7
                         md5sum_1m = f7f67b5da46923a9f01da8a2b6909654
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
                             tftp = images/sles-11-1-64/tftpboot
-                            #floppy = images/sles-11-1-64/autoyast.vfd
-                            cdrom_unattended = images/sles-11-1-64/autoyast.iso
+                            floppy = images/sles-11-1-64/autoyast.vfd
+                            #cdrom_unattended = images/sles-11-1-64/autoyast.iso
                             pxe_dir = boot/x86_64/loader
 
             - @Ubuntu:
                 shell_prompt = "^root@.*[\#\$]\s*$"
 
                 variants:
                     - Ubuntu-6.10-32:
                         only install
                         image_name = ubuntu-6.10-32
                         steps = Ubuntu-6.10-32.steps
@@ skipping 194 matching lines @@
                         md5sum_1m = a744084a03f6a08627f71527fc107a1e
                         unattended_install.cdrom:
                             unattended_file = unattended/RHEL-5-series.ks
                             tftp = images/rhel55-64/tftpboot
                             #floppy = images/rhel55-64/ks.vfd
                             cdrom_unattended = images/rhel55-64/ks.iso
 
 
     # Windows section
     - @Windows:
-        no autotest linux_s3 vlan_tag ioquit unattended_install.(url|nfs|remote_ks)
+        no autotest linux_s3 vlan ioquit unattended_install.(url|nfs|remote_ks) jumbo nicdriver_unload nic_promisc multicast mac_change ethtool
         shutdown_command = shutdown /s /f /t 0
         reboot_command = shutdown /r /f /t 0
         status_test_command = echo %errorlevel%
         shell_prompt = "^\w:\\.*>\s*$"
         username = Administrator
         password = 123456
         shell_linesep = "\r\n"
         shell_client = nc
         shell_port = 10022
         file_transfer_client = rss
@@ skipping 71 matching lines @@
             nic_virtio:
                 match_string = "VirtIO Ethernet"
         block_hotplug:
             wait_secs_for_hook_up = 10
             reference_cmd = wmic diskdrive list brief
             find_pci_cmd = wmic diskdrive list brief
             pci_test_cmd = echo select disk 1 > dt && echo online >> dt && echo detail disk >> dt && echo exit >> dt && diskpart /s dt
         physical_resources_check:
             catch_uuid_cmd = 
 
+        file_transfer:
+            tmp_dir = C:\
+            clean_cmd = del
         variants:
             - Win2000:
                 no reboot whql
                 image_name = win2000-32
                 kill_vm_gracefully = no
                 install:
                     steps = Win2000-32.steps
                     cdrom_cd1 = windows/Windows2000_sp4.iso
                     md5sum = dda6039f3a9173f0f6bfae40f5efdfea
                     md5sum_1m = dd28fba196d366d56fe774bd93df5527
@@ skipping 534 matching lines @@
         driver = igb
         # Driver option to specify the maximum number of virtual functions
         # (on vxge the option is , for example, is max_config_dev)
         # the default below is for the igb driver
         driver_option = "max_vfs=7"
         # Number of devices that are going to be requested.
         devices_requested = 7
 
 
 steps ?<= steps/