Skip to content

Commit 7fddbce

Browse files
merelissdgrPeter Merelisrobertcheramy
authored
ironware model: graceful handling of N-digit temps, addition of simulated ironware:ICX7150-48Z-HPOE (Ruckus) yaml (#3457)
* update regex to be more permissive per CI automation * adding yaml simulation data for ironware:ICX7150-48Z-HPOE * Add a unit test for ironware simulation.yaml --------- Co-authored-by: Peter Merelis <merelis@petermerelis-mbp.local> Co-authored-by: Robert Cheramy <r.cheramy@netze-bw.de>
1 parent c12886a commit 7fddbce

File tree

4 files changed

+840
-2
lines changed

4 files changed

+840
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
66

77
## [Unreleased]
8-
98
### Added
109

1110
### Changed
1211

1312
### Fixed
1413
- nxos: ignore bootflash size and permission errors (@rouven0)
1514
- githubrepo: explicitly tell when Rugged isn't installed with ssh support (@robertcheramy)
15+
- ironware: mask temperatures with more than two digits (@merelissdgr)
16+
1617

1718
## [0.33.0 - 2025-03-26]
1819
This release changes the way to configure oxidized-web. The old `rest`
@@ -48,6 +49,7 @@ so be sure to update to the latest version.
4849
- srosmd: add ignore regex for 64-bit system uptime (@emiliaaah)
4950
- removed some rubocop warnings (@robertcheramy)
5051

52+
5153
## [0.32.2 – 2025-02-27]
5254
This patch release mainly fixes the docker building process, wich resulted in
5355
0.32.1 not beeing built.

lib/oxidized/model/ironware.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class IronWare < Oxidized::Model
3737
cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
3838
cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
3939
cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
40-
cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
40+
cfg.gsub! /\d+\.\d deg-C/, 'XX.X deg-C'
4141
if cfg.include? "TEMPERATURE"
4242
sc = StringScanner.new cfg
4343
out = ''

0 commit comments

Comments
 (0)