diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-02-22 01:33:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-22 01:33:06 +0000 |
| commit | 9e73f5af39c035f25b0ac081e999907865789f9e (patch) | |
| tree | 5cc3e327e5b61afa37c1747443e7a448fdd4ecec | |
| parent | 21ac023d8e90b61f4e82e3952a2f706f7db1038a (diff) | |
| parent | 45020cfbc19efac343547f4a966875c319cde748 (diff) | |
| download | extras-brillo-m10-dev.tar.gz | |
Merge "Teach iproute how to dump IP addresses as well."brillo-m10-releasebrillo-m10-dev
| -rw-r--r-- | tests/net_test/iproute.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/net_test/iproute.py b/tests/net_test/iproute.py index 2c639932..91014793 100644 --- a/tests/net_test/iproute.py +++ b/tests/net_test/iproute.py @@ -118,6 +118,7 @@ RTACacheinfo = cstruct.Struct( # Interface address attributes. IFA_ADDRESS = 1 IFA_LOCAL = 2 +IFA_LABEL = 3 IFA_CACHEINFO = 6 # Address flags. @@ -280,7 +281,8 @@ class IPRoute(netlink.NetlinkSocket): "RTA_GATEWAY", "RTA_PREFSRC", "RTA_UID", "NDA_DST"]: data = socket.inet_ntop(msg.family, nla_data) - elif name in ["FRA_IIFNAME", "FRA_OIFNAME", "IFLA_IFNAME", "IFLA_QDISC"]: + elif name in ["FRA_IIFNAME", "FRA_OIFNAME", "IFLA_IFNAME", "IFLA_QDISC", + "IFA_LABEL"]: data = nla_data.strip("\x00") elif name == "RTA_METRICS": data = self._ParseAttributes(-RTA_METRICS, msg.family, None, nla_data) @@ -424,6 +426,11 @@ class IPRoute(netlink.NetlinkSocket): ifinfomsg = IfinfoMsg((0, 0, 0, 0, 0, 0)) return self._Dump(RTM_GETLINK, ifinfomsg, IfinfoMsg, "") + def DumpAddresses(self, version): + family = self._AddressFamily(version) + ifaddrmsg = IfAddrMsg((family, 0, 0, 0, 0)) + return self._Dump(RTM_GETADDR, ifaddrmsg, IfAddrMsg, "") + def _Address(self, version, command, addr, prefixlen, flags, scope, ifindex): """Adds or deletes an IP address.""" family = self._AddressFamily(version) |