From nobody Fri Mar 7 04:15:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z8Ccc1QL9z5qbsv; Fri, 07 Mar 2025 04:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8Ccb5snxz466t; Fri, 07 Mar 2025 04:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRK0tbxaDBVxqyaDNKPpCf5vv+W0qi6yGe93nPYh/2A=; b=QN1BAIwTnuFckmc1/yn7IYS/trCy6S7DxWg4jar5V/0S6svCWkwW4msbnQJq5XrU8OqQxt h27zexohXB6diS2AiErNZgcu6ff9LadHKDuqMq7uS735Vo/N/c6KVuQ1i1Bgw1ecsgi1CY YO1Wsii8GWYV8YlOu4D3+nKgFRqqAXKjCSX4WP7+qMmFiIywvMT/DK7pSvdkm68CVg90hs UR3xlpHTQJMBfVoZDu8dsXsP/VbEoqkIh5mJS/Ly8nNmYFwddkyWAfHLKkwjh07sSkGXse K1exc42wJhDH3XyoaKZsgyRiQ5ifqwMatC6dHh12CsCMVB0PqNP67OYNu18zyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741320911; a=rsa-sha256; cv=none; b=jZ1EXgfFMO6EYOhGZu8Qg+sDqRhzOvae+93DYMx0gJ+E11UmWEOj4VrTqdZoZwARjskMw0 SFCqoDqfxv1zbsGR32L1Rnb9v+N8MHGlqG6DE+J5RgQdsAfol5NlFqB0lYN9RKldPONOvs 4d8RTVebBrihaXyZpTZQsEF72ZA6yID8OBfc4g5NbkwcSu5A62E/+StIt3hiWEj9qY/aeR c4knS1fv2bePqPRp4loDabeCWsdWXCZNxHUlmfVuULc/6iPFv3xGTgo0VmHr/ZQeXhFkqE coXcRm91JHqe59C+TjYJqNvcUkhYknpDRkCBQPuu6HoNlfDezGEEUeZoHW1lnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRK0tbxaDBVxqyaDNKPpCf5vv+W0qi6yGe93nPYh/2A=; b=G3tVumQeF/vOJ3kTTPEle86jD24ZjV7HGTMRtEYtcY5pU5nR4+kdhnjBtgTXin26xFlLc8 B4v0sb1Ri0iC2FYFB2sIniEbKcT9lteIRWuqa9KNKcttCCtMt/eaw9FIPWaTyk5e6qQsUQ Bm5AzrX1S4e2gnF32y0rZ11c5PwTMQ9nScBD2PaJ6PoCYy1EfB2D/c1YfaaGwZeg8tzEH3 D83XwK2JVbcDuuPSZsXFpRKHy8r4vGxuTWkLdZrXGzz80OzrZNpYXJ8zpmG9k5DL4Ls4j0 HGhIguthEhnoDCLLzjV1FDC5lbhrFt+ITDee22m8aNEb2IziY77+sT3xKQpA2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z8Ccb5T7Xz62j; Fri, 07 Mar 2025 04:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5274FBg9049647; Fri, 7 Mar 2025 04:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5274FBdl049644; Fri, 7 Mar 2025 04:15:11 GMT (envelope-from git) Date: Fri, 7 Mar 2025 04:15:11 GMT Message-Id: <202503070415.5274FBdl049644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5d8b48487acc - main - tests/netlink: Assert the route scope of interface's addresses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d8b48487acc8375675f2b7c4507c98ac5d0bf75 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5d8b48487acc8375675f2b7c4507c98ac5d0bf75 commit 5d8b48487acc8375675f2b7c4507c98ac5d0bf75 Author: Zhenlei Huang AuthorDate: 2025-03-07 04:14:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-07 04:14:44 +0000 tests/netlink: Assert the route scope of interface's addresses While here, add one additional IPv4 link-local address to test_46_nofilter to cover the IPv4 RT_SCOPE_LINK case. Reviewed by: melifaro, #network MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49226 --- tests/sys/netlink/test_rtnl_ifaddr.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/sys/netlink/test_rtnl_ifaddr.py b/tests/sys/netlink/test_rtnl_ifaddr.py index 48e53502df54..768bf38153ff 100644 --- a/tests/sys/netlink/test_rtnl_ifaddr.py +++ b/tests/sys/netlink/test_rtnl_ifaddr.py @@ -33,7 +33,10 @@ class TestRtNlIfaddrList(NetlinkTestTemplate, SingleVnetTestTemplate): def setup_method(self, method): method_name = method.__name__ if "4" in method_name: - self.IPV4_PREFIXES = ["192.0.2.1/24"] + if "nofilter" in method_name: + self.IPV4_PREFIXES = ["192.0.2.1/24", "169.254.169.254/16"] + else: + self.IPV4_PREFIXES = ["192.0.2.1/24"] if "6" in method_name: self.IPV6_PREFIXES = ["2001:db8::1/64"] super().setup_method(method) @@ -49,14 +52,21 @@ class TestRtNlIfaddrList(NetlinkTestTemplate, SingleVnetTestTemplate): for rx_msg in self.read_msg_list(msg.nl_hdr.nlmsg_seq, NlRtMsgType.RTM_NEWADDR): ifname = socket.if_indextoname(rx_msg.base_hdr.ifa_index) family = rx_msg.base_hdr.ifa_family - ret.append((ifname, family, rx_msg)) + scope = rx_msg.base_hdr.ifa_scope + ret.append((ifname, family, scope)) ifname = "lo0" - assert len([r for r in ret if r[0] == ifname]) > 0 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 3 ifname = self.vnet.iface_alias_map["if1"].name - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET]) == 1 - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6]) == 2 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 4 def test_46_filter_iface(self): """Tests that listing outputs both IPv4/IPv6 for the specific interface"""