From patchwork Fri Apr 3 00:28:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 16017 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n330ShdK017737 for ; Fri, 3 Apr 2009 00:28:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbZDCA2Z (ORCPT ); Thu, 2 Apr 2009 20:28:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753844AbZDCA2Y (ORCPT ); Thu, 2 Apr 2009 20:28:24 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:59584 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbZDCA2Y (ORCPT ); Thu, 2 Apr 2009 20:28:24 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n330IhwO007521 for ; Thu, 2 Apr 2009 20:18:43 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n330SLuu186756 for ; Thu, 2 Apr 2009 20:28:21 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n330SL9o016054 for ; Thu, 2 Apr 2009 20:28:21 -0400 Received: from localhost.localdomain (frylock.austin.ibm.com [9.53.41.12]) by d01av04.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n330SLn9016031; Thu, 2 Apr 2009 20:28:21 -0400 Received: by localhost.localdomain (Postfix, from userid 1000) id 65E251BF83; Thu, 2 Apr 2009 19:28:17 -0500 (CDT) Date: Thu, 2 Apr 2009 19:28:17 -0500 From: Ryan Harper To: Uri Lublin Cc: kvm@vger.kernel.org Subject: [PATCH] kvm-autotest: kvm_vm.py get values from nic_params dict Message-ID: <20090403002817.GA20681@us.ibm.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Looks like cut-n-paste error. We should be fetching values from nic_params, not image params. diffstat output: kvm_vm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Ryan Harper --- diff --git a/client/tests/kvm_runtest_2/kvm_vm.py b/client/tests/kvm_runtest_2/kvm_vm.py index 2e6599e..5136a26 100644 --- a/client/tests/kvm_runtest_2/kvm_vm.py +++ b/client/tests/kvm_runtest_2/kvm_vm.py @@ -189,8 +189,8 @@ class VM: for nic_name in kvm_utils.get_sub_dict_names(params, "nics"): nic_params = kvm_utils.get_sub_dict(params, nic_name) qemu_cmd += " -net nic,vlan=%d" % vlan - if image_params.get("nic_model"): - qemu_cmd += ",model=%s" % image_params.get("nic_model") + if nic_params.get("nic_model"): + qemu_cmd += ",model=%s" % nic_params.get("nic_model") qemu_cmd += " -net user,vlan=%d" % vlan vlan += 1