Merge remote branch 'autotest-upstream/master' into try-box1

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 614 matching lines @@
         nic_mode = tap
         vms += " vm2"
         image_snapshot = yes
         kill_vm_vm2 = yes
         kill_vm_gracefully_vm2 = no
 
     - ping: install setup unattended_install.cdrom
         type = ping
         counts = 100
         flood_minutes = 10
+        nics += ' nic2'
 
     - 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
+        filesize = 100
+        transfer_timeout = 100
+        transfer_type = remote
+        sessions_num = 10
 
     - nic_promisc:  install setup unattended_install.cdrom
         type = nic_promisc
-        file_size = 1, 1460, 65000, 100000000
+        filesize = 400
+        transfer_timeout = 100
+        transfer_type = remote
 
     - 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
@@ skipping 35 matching lines @@
     - nic_bonding:
         type = nic_bonding
         nics += ' nic2 nic3 nic4'
         image_snapshot = yes
         serial_login = yes
         test_timeout = 1000
         filesize = 4000
         transfer_timeout = 1000
         transfer_type = remote
         kill_vm = yes
+        # you can specify the parameters of bonding module here
+        # bonding_params = "mode=active-backup"
 
     - set_link:
         type = set_link
         test_timeout = 1000
         filesize = 4000
         transfer_timeout = 1000
         transfer_type = remote
         kill_vm =yes
 
     - physical_resources_check: install setup unattended_install.cdrom
@@ skipping 173 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
+        no ethtool
         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:
@@ skipping 768 matching lines @@
                             kernel = images/rhel55-64/vmlinuz
                             initrd = images/rhel55-64/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-5.5-x86_64-DVD.iso
                             md5sum_cd1 = f3119f883257ef9041234feda2f1cad0
                             md5sum_1m_cd1 = a744084a03f6a08627f71527fc107a1e
 
 
                     - 6.0.i386:
                         no setup
+                        nic_hotplug:
+                            modprobe_module =
+                        block_hotplug:
+                            modprobe_module =
                         image_name = rhel6-32
                         unattended_install:
                             unattended_file = unattended/RHEL-6-series.ks
                             #floppy = images/rhel60-32/ks.vfd
                             cdrom_unattended = images/rhel60-32/ks.iso
                             kernel = images/rhel60-32/vmlinuz
                             initrd = images/rhel60-32/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-6.0-i386-DVD.iso
                             md5sum_cd1 = 291d234c93442405972689b4b41c14bc
                             md5sum_1m_cd1 = ee2cc3d3babe91a1d581a07099c4318b
 
 
                     - 6.0.x86_64:
                         no setup
+                        nic_hotplug:
+                            modprobe_module =
+                        block_hotplug:
+                            modprobe_module =
                         image_name = rhel6-64
                         unattended_install:
                             unattended_file = unattended/RHEL-6-series.ks
                             #floppy = images/rhel60-64/ks.vfd
                             cdrom_unattended = images/rhel60-64/ks.iso
                             kernel = images/rhel60-64/vmlinuz
                             initrd = images/rhel60-64/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-6.0-x86_64-DVD.iso
                             md5sum_cd1 = f7141396c6a19399d63e8c195354317d
@@ skipping 674 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/