From patchwork Mon Dec 27 16:01:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434671 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9q025997 for ; Mon, 27 Dec 2010 20:17:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754461Ab0L0QC5 (ORCPT ); Mon, 27 Dec 2010 11:02:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4421 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754346Ab0L0QCU (ORCPT ); Mon, 27 Dec 2010 11:02:20 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2Jvi030075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:19 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2IPq032110; Mon, 27 Dec 2010 11:02:19 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rFx017175; Mon, 27 Dec 2010 11:02:17 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 11/28] KVM test: make_qemu_command(): catch IndexError when accessing self.netdev_id Date: Mon, 27 Dec 2010 18:01:38 +0200 Message-Id: <1293465715-16599-11-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:17:00 +0000 (UTC) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 6aa8eb4..aeb7448 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -402,11 +402,14 @@ class VM: vlan = 0 for nic_name in kvm_utils.get_sub_dict_names(params, "nics"): nic_params = kvm_utils.get_sub_dict(params, nic_name) + try: + netdev_id = self.netdev_id[vlan] + except IndexError: + netdev_id = None # Handle the '-net nic' part mac = self.get_mac_address(vlan) qemu_cmd += add_nic(help, vlan, nic_params.get("nic_model"), mac, - self.netdev_id[vlan], - nic_params.get("nic_extra_params")) + netdev_id, nic_params.get("nic_extra_params")) # Handle the '-net tap' or '-net user' part script = nic_params.get("nic_script") downscript = nic_params.get("nic_downscript") @@ -420,9 +423,8 @@ class VM: qemu_cmd += add_net(help, vlan, nic_params.get("nic_mode", "user"), self.get_ifname(vlan), script, downscript, tftp, - nic_params.get("bootp"), redirs, - self.netdev_id[vlan], - nic_params.get("netdev_extra_params")) + nic_params.get("bootp"), redirs, netdev_id, + nic_params.get("vhost") == "yes") # Proceed to next NIC vlan += 1