From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 19CC5C5B4 for ; Wed, 24 Jun 2015 11:23:26 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 24 Jun 2015 02:23:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,671,1427785200"; d="scan'208";a="752286241" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 24 Jun 2015 02:23:25 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t5O9NNut005942; Wed, 24 Jun 2015 17:23:23 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t5O9NLhn023330; Wed, 24 Jun 2015 17:23:23 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t5O9NLjo023326; Wed, 24 Jun 2015 17:23:21 +0800 From: Yong Liu To: dts@dpdk.org Date: Wed, 24 Jun 2015 17:23:19 +0800 Message-Id: <1435137799-23294-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] Qemu kvm module support login parameter X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 09:23:27 -0000 From: Marvin Liu Default vm username and password are the same as host. User can change the default values by login parameter. Signed-off-by: Marvin Liu diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index d149524..36622b5 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -92,6 +92,10 @@ class QEMUKvm(VirtBase): # devices pass-through into vm self.pt_devices = [] + # default login user,password + self.username = dut.crb['user'] + self.password = dut.crb['pass'] + def set_vm_default(self): self.set_vm_name(self.vm_name) self.set_vm_enable_kvm() @@ -282,6 +286,22 @@ class QEMUKvm(VirtBase): disk_boot_line = '-drive file=%s' % options['file'] self.__add_boot_line(disk_boot_line) + def add_vm_login(self, **options): + """ + user: login username of virtual machine + password: login password of virtual machine + """ + if 'user' in options.keys(): + user = options['user'] + self.username = user + + if 'password' in options.keys(): + password = options['password'] + self.password = password + + def get_vm_login(self): + return (self.username, self.password) + def set_vm_net(self, **options): index = self.find_option_index('net') if index: diff --git a/framework/virt_base.py b/framework/virt_base.py index 9a0035d..063342f 100644 --- a/framework/virt_base.py +++ b/framework/virt_base.py @@ -294,6 +294,9 @@ class VirtBase(object): crb['bypass core0'] = False vm_ip = self.get_vm_ip() crb['IP'] = vm_ip + username, password = self.get_vm_login() + crb['user'] = username + crb['pass'] = password # remove default key remove_old_rsa_key(self.host_dut.tester, crb['IP']) -- 1.9.3