From nobody Mon May 15 11:48:48 2023 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 4QKd1X4dm2z4BWm7; Mon, 15 May 2023 11:48:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QKd1X47Fmz4B6K; Mon, 15 May 2023 11:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684151328; 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=NEIpvzsE8lapY5KNgKsv7p1119xaGRh8+hU+XC7CcEI=; b=qCnYbqpAwZyaj8tsDCu+RE/G/KL3fyKMWnxuBFipIdyg9sa68FzPrbV5y87o5HpnODaBwE OD6nbIbdtn4kc1BB4ydp3dkIrWzqgYkhVus1QCIa09t9ozbcE1QBq1QmbZKGCns/r3LkWp FZb4lQFcurlI7ppgjKUygwH6WgyqPSXnH3OxexM95m1t7ChGCqBuqGyuyZhlH1m5CAqfC7 BjEucfiRdj+OUwIHvP/5fxDnaRBH+YlpEYoVpmGhSJVxgXb0ZzYXuVDwrISCSGKTEGGO3t IYGBfu3S2xzknduKNk8LATS89adalyTWVQ0uUGWRjj2eFCVJwR7LQIK3EAGeDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684151328; 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=NEIpvzsE8lapY5KNgKsv7p1119xaGRh8+hU+XC7CcEI=; b=FGbYg1PyNcGwOZPplPBWBkZq+1425rw04OfhUoVVQnAppMF/5iFHqtZEJfsYdJpf6PNK/Y FjYFUZhgW4lurbgSUXziyaB6k2Tdwoxe3xp3N/Vh7RlGy8r+sWam4ZSxmjieGcs92g4HKI 98fcc/ckv7w+/DSbgde2Nt3Fapd/pTl3Gc9+MYjmfPXg8q9+ozAPgyUpBfRdMTuVpEDuP/ hjW53qW/9TG9JDUQ+eZ2AOun2F7s7z04wxsX4Pp3+Mvx0Z3oDpToyKQpE1KUWecmibheDg As/whxGLPokLKkYni96j4rd7enIRjOeOYKz4C3vBEm+tj/GoaQ5akBxRFlWRFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684151328; a=rsa-sha256; cv=none; b=M9gcdU2tcVaLQycHJWjqAqJpFCeGF0CaX/mU/wvvQzgiDV4TPN7u5QSlWOBNaIPx5OuGP0 je9tUi2ZGevqf9VwtMFeiZ8mjy+tU1tiPsNqeWvsX6Mqsl+JTJQgblJJo/GXzwhhaTit+5 18s8Oz92GzFSIe5e5lt/8jpAF7QlEVvJQUTZGf+RKFxoWQ9W0V0gZFoEwSP08NkN4NpkIW 6dabVvT/mc0zk49YvH9n1E1YGcplObYOlQuagfmF6L7/2Uh6pYsgs00B54zlIbPoTGGUCr B0ctpPdJHRtlxDJA4Y2YSEA1vYZ2glf0Eb3xZ8S1qscqeU97wZ6DMgbyErJmnw== 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 4QKd1X37qjzf8y; Mon, 15 May 2023 11:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34FBmm6N078604; Mon, 15 May 2023 11:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FBmmjN078603; Mon, 15 May 2023 11:48:48 GMT (envelope-from git) Date: Mon, 15 May 2023 11:48:48 GMT Message-Id: <202305151148.34FBmmjN078603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: d91f8db5f182 - main - testing: rename IfattrType to IfaAttrType for consistency 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d91f8db5f1822c43cd256f19aae1d059e4b25a26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d91f8db5f1822c43cd256f19aae1d059e4b25a26 commit d91f8db5f1822c43cd256f19aae1d059e4b25a26 Author: Alexander V. Chernikov AuthorDate: 2023-05-15 11:47:07 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-15 11:47:07 +0000 testing: rename IfattrType to IfaAttrType for consistency All other attribute classes are named as 'type'AttrType and 'type' int this case is ifa (interface address). MFC after: 2 weeks --- tests/atf_python/sys/netlink/netlink_route.py | 14 +++++++------- tests/sys/netlink/test_rtnl_ifaddr.py | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/atf_python/sys/netlink/netlink_route.py b/tests/atf_python/sys/netlink/netlink_route.py index 81f4e89d3e57..cd3ffbe31a00 100644 --- a/tests/atf_python/sys/netlink/netlink_route.py +++ b/tests/atf_python/sys/netlink/netlink_route.py @@ -376,7 +376,7 @@ class IfaddrMsg(Structure): ] -class IfattrType(Enum): +class IfaAttrType(Enum): IFA_UNSPEC = 0 IFA_ADDRESS = auto() IFA_LOCAL = auto() @@ -570,12 +570,12 @@ rtnl_ifla_attrs = prepare_attrs_map( rtnl_ifa_attrs = prepare_attrs_map( [ - AttrDescr(IfattrType.IFA_ADDRESS, NlAttrIp), - AttrDescr(IfattrType.IFA_LOCAL, NlAttrIp), - AttrDescr(IfattrType.IFA_LABEL, NlAttrStr), - AttrDescr(IfattrType.IFA_BROADCAST, NlAttrIp), - AttrDescr(IfattrType.IFA_ANYCAST, NlAttrIp), - AttrDescr(IfattrType.IFA_FLAGS, NlAttrU32), + AttrDescr(IfaAttrType.IFA_ADDRESS, NlAttrIp), + AttrDescr(IfaAttrType.IFA_LOCAL, NlAttrIp), + AttrDescr(IfaAttrType.IFA_LABEL, NlAttrStr), + AttrDescr(IfaAttrType.IFA_BROADCAST, NlAttrIp), + AttrDescr(IfaAttrType.IFA_ANYCAST, NlAttrIp), + AttrDescr(IfaAttrType.IFA_FLAGS, NlAttrU32), ] ) diff --git a/tests/sys/netlink/test_rtnl_ifaddr.py b/tests/sys/netlink/test_rtnl_ifaddr.py index 503eabd27146..1e7d6ca62bd8 100644 --- a/tests/sys/netlink/test_rtnl_ifaddr.py +++ b/tests/sys/netlink/test_rtnl_ifaddr.py @@ -6,7 +6,7 @@ from atf_python.sys.net.vnet import SingleVnetTestTemplate from atf_python.sys.netlink.base_headers import NlmBaseFlags from atf_python.sys.netlink.base_headers import Nlmsghdr from atf_python.sys.netlink.netlink import NetlinkTestTemplate -from atf_python.sys.netlink.netlink_route import IfattrType +from atf_python.sys.netlink.netlink_route import IfaAttrType from atf_python.sys.netlink.netlink_route import NetlinkIfaMessage from atf_python.sys.netlink.netlink_route import NlRtMsgType from atf_python.sys.netlink.netlink_route import RtScope @@ -115,12 +115,12 @@ class TestRtNlIfaddr(NetlinkTestTemplate, SingleVnetTestTemplate): # Ignore IFA_FLAGS for now assert msg.base_hdr.ifa_scope == RtScope.RT_SCOPE_UNIVERSE.value - assert msg.get_nla(IfattrType.IFA_ADDRESS).addr == "192.0.2.1" - assert msg.get_nla(IfattrType.IFA_LOCAL).addr == "192.0.2.1" - assert msg.get_nla(IfattrType.IFA_BROADCAST).addr == "192.0.2.255" + assert msg.get_nla(IfaAttrType.IFA_ADDRESS).addr == "192.0.2.1" + assert msg.get_nla(IfaAttrType.IFA_LOCAL).addr == "192.0.2.1" + assert msg.get_nla(IfaAttrType.IFA_BROADCAST).addr == "192.0.2.255" epair_ifname = self.vnet.iface_alias_map["if1"].name - assert msg.get_nla(IfattrType.IFA_LABEL).text == epair_ifname + assert msg.get_nla(IfaAttrType.IFA_LABEL).text == epair_ifname def test_6_broadcast(self): """Tests header/attr output for listing IPv6 ifas on broadcast iface""" @@ -137,12 +137,12 @@ class TestRtNlIfaddr(NetlinkTestTemplate, SingleVnetTestTemplate): # Ignore IFA_FLAGS for now assert msg.base_hdr.ifa_scope == RtScope.RT_SCOPE_UNIVERSE.value - assert msg.get_nla(IfattrType.IFA_ADDRESS).addr == "2001:db8::1" - assert msg.get_nla(IfattrType.IFA_LOCAL) is None - assert msg.get_nla(IfattrType.IFA_BROADCAST) is None + assert msg.get_nla(IfaAttrType.IFA_ADDRESS).addr == "2001:db8::1" + assert msg.get_nla(IfaAttrType.IFA_LOCAL) is None + assert msg.get_nla(IfaAttrType.IFA_BROADCAST) is None epair_ifname = self.vnet.iface_alias_map["if1"].name - assert msg.get_nla(IfattrType.IFA_LABEL).text == epair_ifname + assert msg.get_nla(IfaAttrType.IFA_LABEL).text == epair_ifname # Local: fe80::/64 msg = lmsg @@ -150,12 +150,12 @@ class TestRtNlIfaddr(NetlinkTestTemplate, SingleVnetTestTemplate): # Ignore IFA_FLAGS for now assert msg.base_hdr.ifa_scope == RtScope.RT_SCOPE_LINK.value - addr = ipaddress.ip_address(msg.get_nla(IfattrType.IFA_ADDRESS).addr) + addr = ipaddress.ip_address(msg.get_nla(IfaAttrType.IFA_ADDRESS).addr) assert addr.is_link_local # Verify that ifindex is not emmbedded assert struct.unpack("!H", addr.packed[2:4])[0] == 0 - assert msg.get_nla(IfattrType.IFA_LOCAL) is None - assert msg.get_nla(IfattrType.IFA_BROADCAST) is None + assert msg.get_nla(IfaAttrType.IFA_LOCAL) is None + assert msg.get_nla(IfaAttrType.IFA_BROADCAST) is None epair_ifname = self.vnet.iface_alias_map["if1"].name - assert msg.get_nla(IfattrType.IFA_LABEL).text == epair_ifname + assert msg.get_nla(IfaAttrType.IFA_LABEL).text == epair_ifname