[dts] [PATCH v2] covert DUT hostname into ipaddress for qemu tcp forward

[dts] [PATCH v2] covert DUT hostname into ipaddress for qemu tcp forward

[Yong Liu]

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

v2 changes:
    import re in settings module
    fix typo issue in qemu_kvm module

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

diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index 434c32d..d149524 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -36,6 +36,7 @@ import os
 
 from virt_base import VirtBase
 from exception import StartVMFailedException
+from settings import get_host_ip
 
 # This name is derictly defined in the qemu guest serivce
 # So you can not change it except it is changed by the service
@@ -408,7 +409,8 @@ class QEMUKvm(VirtBase):
         # get the host addr
         host_addr = field(opt_hostfwd, 1)
         if not host_addr:
-            host_addr = str(self.host_dut.get_ip_address())
+            addr = str(self.host_dut.get_ip_address())
+            host_addr = get_host_ip(addr)
 
         # get the host port in the option
         host_port = field(opt_hostfwd, 2).split('-')[0]
diff --git a/framework/settings.py b/framework/settings.py
index d3cdf80..9923b0c 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -31,6 +31,9 @@
 """
 Folders for framework running enviornment.
 """
+import re
+import socket
+
 FOLDERS = {
     'Framework': 'framework',
     'Testscripts': 'tests',
@@ -200,3 +203,16 @@ def get_netdev(crb, pci):
                     return vf
 
     return None
+
+def get_host_ip(address):
+    ip_reg = r'\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}'
+    m = re.match(ip_reg, address)
+    if m:
+        return address
+    else:
+        try:
+            result=socket.gethostbyaddr(address)
+            return result[2][0]
+        except:
+            print "couldn't look up %s" % address
+            return ''
-- 
1.9.3