[PATCH 1/2] virt test: Simplifying address cache messages and exceptions

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



KVM autotest relies on a system that listens network traffic
and registers DHCP leases, so we know what is the IP for a
given guest network card. However, the terminology used on
messages is highly specific to the internal implementation.

So let's use messages with a terminology that can be more
easily understood by people not too familiar with the
internals of autotest.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
 client/virt/virt_env_process.py |    2 +-
 client/virt/virt_vm.py          |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/virt/virt_env_process.py b/client/virt/virt_env_process.py
index ab2f77e..a4b9f71 100644
--- a/client/virt/virt_env_process.py
+++ b/client/virt/virt_env_process.py
@@ -449,7 +449,7 @@ def _update_address_cache(address_cache, line):
         if matches and address_cache.get("last_seen"):
             mac_address = matches[0].lower()
             if time.time() - address_cache.get("time_%s" % mac_address, 0) > 5:
-                logging.debug("(address cache) Adding cache entry: %s ---> %s",
+                logging.debug("(address cache) DCHP lease OK: %s --> %s",
                               mac_address, address_cache.get("last_seen"))
             address_cache[mac_address] = address_cache.get("last_seen")
             address_cache["time_%s" % mac_address] = time.time()
diff --git a/client/virt/virt_vm.py b/client/virt/virt_vm.py
index 5cb900b..e2443dd 100644
--- a/client/virt/virt_vm.py
+++ b/client/virt/virt_vm.py
@@ -130,8 +130,8 @@ class VMAddressVerificationError(VMAddressError):
         self.ip = ip
 
     def __str__(self):
-        return ("Cannot verify MAC-IP address mapping using arping: "
-                "%s ---> %s" % (self.mac, self.ip))
+        return ("Could not verify DHCP lease: "
+                "%s --> %s" % (self.mac, self.ip))
 
 
 class VMMACAddressMissingError(VMAddressError):
@@ -140,7 +140,7 @@ class VMMACAddressMissingError(VMAddressError):
         self.nic_index = nic_index
 
     def __str__(self):
-        return "No MAC address defined for NIC #%s" % self.nic_index
+        return "No MAC defined for NIC #%s" % self.nic_index
 
 
 class VMIPAddressMissingError(VMAddressError):
@@ -149,7 +149,7 @@ class VMIPAddressMissingError(VMAddressError):
         self.mac = mac
 
     def __str__(self):
-        return "Cannot find IP address for MAC address %s" % self.mac
+        return "No DHCP lease for MAC %s" % self.mac
 
 
 class VMAddNetDevError(VMError):
-- 
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux