From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Meneghel Rodrigues Subject: [PATCH] virt: Revert only update macaddr cache when capture dhcp ACK pkt Date: Mon, 24 Oct 2011 14:54:58 -0200 Message-ID: <1319475298-23680-1-git-send-email-lmr@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: autotest@test.kernel.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Revert commit d9bab5bef598b4b415d004eb62e9cd32c3243565, that changes how the macaddr cache is updated. This patch brought a lot of regressions on our internal tests, so it'll be dropped until a possibly safer version of the fix is proposed. Signed-off-by: Lucas Meneghel Rodrigues --- client/virt/virt_env_process.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/client/virt/virt_env_process.py b/client/virt/virt_env_process.py index a1ec07a..25285b8 100644 --- a/client/virt/virt_env_process.py +++ b/client/virt/virt_env_process.py @@ -403,20 +403,14 @@ def _update_address_cache(address_cache, line): address_cache["last_seen"] = matches[0] if re.search("Client.Ethernet.Address", line, re.IGNORECASE): matches = re.findall(r"\w*:\w*:\w*:\w*:\w*:\w*", line) - if matches: - address_cache["last_mac"] = matches[0] - if re.search("DHCP-Message", line, re.IGNORECASE): - matches = re.findall(r"ACK", line) - if matches and (address_cache.get("last_seen") and - address_cache.get("last_mac")): - mac_address = address_cache.get("last_mac").lower() + 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", mac_address, address_cache.get("last_seen")) address_cache[mac_address] = address_cache.get("last_seen") address_cache["time_%s" % mac_address] = time.time() del address_cache["last_seen"] - del address_cache["last_mac"] def _take_screendumps(test, params, env): -- 1.7.7