From patchwork Mon Aug 23 08:52:03 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Amos Kong <akong@redhat.com>
X-Patchwork-Id: 123561
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7N9QZR2027645
	for <patchwork-kvm@patchwork.kernel.org>;
	Mon, 23 Aug 2010 09:38:24 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752173Ab0HWItI (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Mon, 23 Aug 2010 04:49:08 -0400
Received: from mx1.redhat.com ([209.132.183.28]:59478 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751772Ab0HWItH (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 23 Aug 2010 04:49:07 -0400
Received: from int-mx03.intmail.prod.int.phx2.redhat.com
	(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7N8n7Cu032411
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 23 Aug 2010 04:49:07 -0400
Received: from [0.0.0.190] (dhcp-91-190.nay.redhat.com [10.66.91.190])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o7N8n5r6007322; Mon, 23 Aug 2010 04:49:05 -0400
Subject: [PATCH v2 02/17] Add a get_ifname function
To: autotest@vger.kernel.org
From: Amos Kong <akong@redhat.com>
Cc: lmr@redhat.com, kvm@vger.kernel.org
Date: Mon, 23 Aug 2010 16:52:03 +0800
Message-ID: <20100823085203.19173.14718.stgit@190>
In-Reply-To: <20100823084745.19173.61655.stgit@190>
References: <20100823084745.19173.61655.stgit@190>
User-Agent: StGit/0.15
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Mon, 23 Aug 2010 09:38:26 +0000 (UTC)


diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index 6812c98..e4f216c 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -428,7 +428,7 @@ class VM:
             if tftp:
                 tftp = kvm_utils.get_path(root_dir, tftp)
             qemu_cmd += add_net(help, vlan, nic_params.get("nic_mode", "user"),
-                                nic_params.get("nic_ifname"),
+                                self.get_ifname(vlan),
                                 script, downscript, tftp,
                                 nic_params.get("bootp"), redirs,
                                 self.netdev_id[vlan])
@@ -960,6 +960,24 @@ class VM:
                              "redirected" % port)
             return self.redirs.get(port)
 
+    def get_ifname(self, nic_index=0):
+        """
+        Return the ifname of tap device for the guest nic.
+
+        The vnc_port is unique for each VM, nic_index is unique for each nic
+        of one VM, it can avoid repeated ifname.
+
+        @param nic_index: Index of the NIC
+        """
+        nics = kvm_utils.get_sub_dict_names(self.params, "nics")
+        nic_name = nics[nic_index]
+        nic_params = kvm_utils.get_sub_dict(self.params, nic_name)
+        if nic_params.get("nic_ifname"):
+            return nic_params.get("nic_ifname")
+        else:
+            return "%s_%s_%s" % (nic_params.get("nic_model"),
+                                 nic_index, self.vnc_port)
+
     def get_macaddr(self, nic_index=0):
         """
         Return the macaddr of guest nic.