[dts] [dts 8/9] Optimize ssh_pexpect and virt_resource module

[Yong Liu]

From: Marvin Liu <yong.liu at intel.com>

Signed-off-by: Marvin Liu <yong.liu at intel.com>

diff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py
index a474500..879b9de 100644
--- a/framework/ssh_pexpect.py
+++ b/framework/ssh_pexpect.py
@@ -18,8 +18,8 @@ class SSHPexpect(object):
         self.magic_prompt = "MAGIC PROMPT"
         try:
             self.session = pxssh.pxssh()
-            self.username = username
             self.host = host
+            self.username = username
             self.password = password
             if ':' in host:
                 self.ip = host.split(':')[0]
@@ -63,12 +63,13 @@ class SSHPexpect(object):
             if not int(ret_status):
                 return ret
             else:
+                self.logger.error("Command: %s failure!" % command)
                 self.logger.error(ret)
-                return ret_status
+                return int(ret_status)
         else:
             return ret
 
-    def get_session_before(self, timeout):
+    def get_session_before(self, timeout=15):
         """
         Get all output before timeout
         """
diff --git a/framework/virt_resource.py b/framework/virt_resource.py
index ce60751..b830f4e 100644
--- a/framework/virt_resource.py
+++ b/framework/virt_resource.py
@@ -161,6 +161,10 @@ class VirtResource(object):
             print "Alloc cpu request vitual machine name!!!"
             return cores
 
+        # if vm has been alloacted cores, just return them
+        if self.__vm_has_resource(vm, 'cores'):
+            return self.allocated_info[vm]['cores']
+
         if number != -1:
             for core in self.unused_cores:
                 if core != -1 and number != 0:
-- 
1.9.3