From e50ee354b8c90cae73048d37fd3b212769204ac4 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 12 Mar 2024 03:18:00 -0700 Subject: [PATCH] Configure DNF on Arista EOS 4.31+ Differential Revision: D54747272 fbshipit-source-id: fb45b067dbd6f408ed50d2921a2738713079bee9 --- cookbooks/fb_helpers/README.md | 3 +++ cookbooks/fb_helpers/libraries/node_methods.rb | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cookbooks/fb_helpers/README.md b/cookbooks/fb_helpers/README.md index 09c044f3..45986489 100644 --- a/cookbooks/fb_helpers/README.md +++ b/cookbooks/fb_helpers/README.md @@ -240,6 +240,9 @@ your node. * `node.aristaeos_4_28_or_newer?` Is network switch running Arista EOS and OS version is 4.28 or newer +* `node.aristaeos_4_31_or_newer?` + Is network switch running Arista EOS and OS version is 4.31 or newer + * `node.embedded?` Is embedded Linux, implies 'node.aristaeos?'. These devices likely have minimal packages installed, little space, and/or some non-persistent diff --git a/cookbooks/fb_helpers/libraries/node_methods.rb b/cookbooks/fb_helpers/libraries/node_methods.rb index 48e9e76e..9997ac26 100644 --- a/cookbooks/fb_helpers/libraries/node_methods.rb +++ b/cookbooks/fb_helpers/libraries/node_methods.rb @@ -532,6 +532,10 @@ def aristaeos_4_28_or_newer? self.aristaeos? && self._self_version >= self._canonical_version('4.28') end + def aristaeos_4_31_or_newer? + self.aristaeos? && self._self_version >= self._canonical_version('4.31') + end + def embedded? self.aristaeos? end @@ -1026,7 +1030,7 @@ def filesystem_data # returns the version-release of an rpm installed, or nil if not present def rpm_version(name) if (self.centos? && !self.centos7?) || self.fedora? || self.redhat8? || self.oracle8? || self.redhat9? || - self.oracle9? + self.oracle9? || self.aristaeos_4_31_or_newer? # returns epoch.version v = Chef::Provider::Package::Dnf::PythonHelper.instance. package_query(:whatinstalled, name).version