Skip to content

eatonnetwork: add model unit test and simplify the model #3844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thanegill wants to merge 3 commits into
base: master
Choose a base branch
from
Open

eatonnetwork: add model unit test and simplify the model #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f65056a
spec: add eatonnetwork model unit test
thanegill Jun 10, 2026
9bbed6f
eatonnetwork: simplify the model
thanegill Jun 10, 2026
21e1b5d
Merge branch 'master' into eatonnetwork-spec-data
thanegill Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [Unreleased]
### Added
- eatonnetwork: model unit test (@thanegill)
- source/sql: support defining port in configuration. Closes #3853 (@ytti)

### Changed
Expand Down
65 changes: 33 additions & 32 deletions lib/oxidized/model/eatonnetwork.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,58 +9,59 @@ class EatonNetwork < Oxidized::Model
# See docs/Model-Notes/EatonNetwork.md for more info
post do
# Get config in post to allow passing auth password to cmd.
cfg = cmd "save_configuration -p #{@node.auth[:password]}"
cfg
cmd "save_configuration -p #{@node.auth[:password]}"
end

cmd :all do |cfg|
# `save_configuration` echos the command back, outputs date time info, with
# last line is the prompt again.
json_str = cfg.each_line.select { |line| line.match /^\{/ }.join
json = JSON.parse(json_str)
# save_configuration echoes the command and date/time around the JSON
# config (a single line) and ends with the prompt; keep only the JSON.
json = JSON.parse(cfg.keep_lines([/^\{/]))

json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['local']['1.0']['predefinedAccounts'].each do |n|
n.delete('attemptLogin')
n['password'].delete('history')
end
json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['local']['1.0']['createdAccounts'].each do |n|
n.delete('attemptLogin')
n['password'].delete('history')
json.dig('features', 'userAndSessionManagement', 'data', 'settings', 'all', '1.0', 'local', '1.0').tap do |key|
(key['predefinedAccounts'] + key['createdAccounts']).each do |account|
account.delete('attemptLogin')
account['password'].delete('history')
end
end

cfg = JSON.pretty_generate(json)
cfg
JSON.pretty_generate(json)
end

cmd :secret do |cfg|
# Re-parse json to remove secrets by json path
json = JSON.parse(cfg)

json.delete('passphrase')
json['features']['rms']['data']['settings'].delete('proxyUsername')
json['features']['rms']['data']['settings'].delete('proxyPassword')
json['features']['rms']['data']['settings'].delete('username')
json['features']['rms']['data']['settings'].delete('password')
json['features']['rms']['data']['settings'].delete('defaultPassword')

json['features']['smtp']['data']['dmeData'].delete('password')
json.dig('features', 'rms', 'data', 'settings').tap do |key|
key.delete('proxyUsername')
key.delete('proxyPassword')
key.delete('username')
key.delete('password')
key.delete('defaultPassword')
end

json.dig('features', 'smtp', 'data', 'dmeData').delete('password')

json['features']['snmp']['data']['dmeData']['v3']['users'].each do |n|
n['auth'].delete('password')
n['priv'].delete('password')
json.dig('features', 'snmp', 'data', 'dmeData', 'v3', 'users').each do |key|
key['auth'].delete('password')
key['priv'].delete('password')
end

json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['ldap']['1.0']['settings']['connectivity']['bind'].delete('password')
json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['primaryServer'].delete('secret')
json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['secondaryServer'].delete('secret')
json.dig('features', 'userAndSessionManagement', 'data', 'settings', 'all', '1.0').tap do |key|
key.dig('ldap', '1.0', 'settings', 'connectivity', 'bind').delete('password')
key.dig('radius', '1.0', 'settings', 'connectivity').tap do |radius|
radius['primaryServer'].delete('secret')
radius['secondaryServer'].delete('secret')
end
end

# Added in frimware v2.2.0
json['features']['peripherals']['data']['dmeData']['ethernet']['ports'].each do |n|
n.dig('dot1x', 'peap', 'password') && n['dot1x']['peap'].delete('password')
# Added in firmware v2.2.0
json.dig('features', 'peripherals', 'data', 'dmeData', 'ethernet', 'ports').each do |key|
key.dig('dot1x', 'peap', 'password') && key['dot1x']['peap'].delete('password')
end

cfg = JSON.pretty_generate(json)
cfg
JSON.pretty_generate(json)
end

cfg :ssh do
Expand Down
Loading