Add support for ipv6 address
PATCH 1/1 Add support for ipv6 address
Hello everyone,
I like to submit a patch to enable ipv6 address support in kvm-autotest. The patch adds a new dictionary called "address6_cache" for ip6 address. Tcpdump is used to create this cache of link-local ipv6 address.
Link-local ipv6 address is used because it eliminates to need to create complex configuration on both the host and the guest.
The ipv6 address for a guest can be obtained by using the new function get_address6 in kvm_vm.py
I will be happy to re-implement or modify the patch based to your comments.
Thanks
yogi
Signed-off-by Yogananth Subramanian <[email protected]>
--- kvm_preprocessing.py | 27 ++++++++++++++++++++++++++- kvm_utils.py | 28 ++++++++++++++++++++++++++++ kvm_vm.py | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 100 insertions(+), 4 deletions(-)
client/tests/kvm/kvm_preprocessing.py +26 -1
@@ -51,7 +51,8 @@ def preprocess_vm(test, params, env, nam logging.debug("VM object found in environment") else: logging.debug("VM object does not exist; creating it") - vm = kvm_vm.VM(name, params, test.bindir, env.get("address_cache")) + vm = kvm_vm.VM(name, params, test.bindir, env.get("address_cache"), + env.get("address6_cache")) kvm_utils.env_register_vm(env, name, vm) start_vm = False
@@ -200,6 +201,14 @@ def preprocess(test, params, env): command=command, output_func=_update_address_cache, output_params=(env["address_cache"],)) + + env["address6_cache"] = {} + command6 = "/usr/sbin/tcpdump -npv ip6 -i any 'dst net ff02::2'" + env["tcpdump6"] = kvm_subprocess.kvm_tail( + command=command6, + output_func=_update_address6_cache, + output_params=(env["address6_cache"],)) + if kvm_utils.wait_for(lambda: not env["tcpdump"].is_alive(), 0.1, 0.1, 1.0): logging.warn("Could not start tcpdump")
@@ -317,6 +326,8 @@ def postprocess(test, params, env): if not living_vms and env.has_key("tcpdump"): env["tcpdump"].close() del env["tcpdump"] + env["tcpdump6"].close() + del env["tcpdump6"] def postprocess_on_error(test, params, env):
@@ -343,3 +354,17 @@ def _update_address_cache(address_cache, mac_address, address_cache.get("last_seen")) address_cache[mac_address] = address_cache.get("last_seen") del address_cache["last_seen"] + +def _update_address6_cache(address6_cache, line): + if re.search("ff02::2:", line, re.IGNORECASE): + matches = re.findall(r"(fe80.+) >", line) + if matches: + address6_cache["last_seen"] = matches[0] + if re.search("source link-address option", line, re.IGNORECASE): + matches = re.findall(r"\w*:\w*:\w*:\w*:\w*:\w*", line) + if matches and address6_cache.get("last_seen"): + mac_address = matches[0].lower() + logging.debug("(address cache) Adding cache entry: %s ---> %s", + mac_address, address6_cache.get("last_seen")) + address6_cache[mac_address] = address6_cache.get("last_seen") + del address6_cache["last_seen"]
client/tests/kvm/kvm_utils.py +28 -0
@@ -208,6 +208,34 @@ def verify_ip_address_ownership(ip, macs o = commands.getoutput("/sbin/arping -f -c 3 -I %s %s" % (dev, ip)) return bool(regex.search(o)) +def verify_ip6_address_ownership(ip, macs, timeout=10.0): + """ + Use ping6 and the ND cache to make sure a given IP address belongs to one + of the given MAC addresses. + + @param ip: An IP6 address. + @param macs: A list or tuple of MAC addresses. + @return: True iff ip is assigned to a MAC address in macs. + """ + # Compile a regex that matches the given IP6 address and any of the given + # MAC addresses + mac_regex = "|".join("(%s)" % mac for mac in macs) + regex = re.compile(r"\b%s\b.*\b(%s)\b" % (ip, mac_regex), re.IGNORECASE) + + # Get the name of the bridge device for ping6 + o = commands.getoutput("/sbin/ip route get ff02::1" ) + dev = re.findall("dev\s+\S+", o, re.IGNORECASE) + if not dev: + return False + dev = dev[0].split()[-1] + + if bool(commands.getstatusoutput("/bin/ping6 -c 11 -I %s %s"% (dev, ip)[0])): + return False + + # Check the ND cache + o = commands.getoutput("/sbin/ip -6 neigh show") + if regex.search(o): + return True # Functions for working with the environment (a dict-like object)
client/tests/kvm/kvm_vm.py +46 -3
91 lines not on this page · raw message
--