Add a convenience _GetMsg function and use it.

Change-Id: I2691dfd2cdd7ffcad8c41d74243e41643baf6805

2 files changed, 7 insertions, 4 deletions

diff --git a/tests/net_test/iproute.py b/tests/net_test/iproute.py
index 7c9eec0f..e0f28373 100644
--- a/tests/net_test/iproute.py
+++ b/tests/net_test/iproute.py
@@ -454,10 +454,7 @@ class IPRoute(netlink.NetlinkSocket):
       # implement parsing dump results.
       raise NotImplementedError("IPv4 RTM_GETADDR not implemented.")
     self._Address(6, RTM_GETADDR, address, 0, 0, RT_SCOPE_UNIVERSE, ifindex)
-    data = self._Recv()
-    if NLMsgHdr(data).type == NLMSG_ERROR:
-      self._ParseAck(data)
-    return self._ParseNLMsg(data, IfAddrMsg)[0]
+    return self._GetMsg(IfAddrMsg)
 
   def _Route(self, version, command, table, dest, prefixlen, nexthop, dev,
              mark, uid):
diff --git a/tests/net_test/netlink.py b/tests/net_test/netlink.py
index 514ad08b..f245901b 100644
--- a/tests/net_test/netlink.py
+++ b/tests/net_test/netlink.py
@@ -200,6 +200,12 @@ class NetlinkSocket(object):
     data = data[attrlen:]
     return (nlmsg, attributes), data
 
+  def _GetMsg(self, msgtype):
+    data = self._Recv()
+    if NLMsgHdr(data).type == NLMSG_ERROR:
+      self._ParseAck(data)
+    return self._ParseNLMsg(data, msgtype)[0]
+
   def _GetMsgList(self, msgtype, data, expect_done):
     out = []
     while data: