Skip to content
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.

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

Fty remerge 20220225 #169

Open
wants to merge 148 commits into
base: FTY
Choose a base branch
from
Open

Conversation

jimklimov
Copy link
Member

ePDU walk diff compared to master branch:

# ./tools/nut-dumpdiff /tmp/nutdev14-pr4.txt /tmp/nutdev14-fty-1.txt
=== ./tools/nut-dumpdiff: comparing '/tmp/nutdev14-pr4.txt' (-) vs '/tmp/nutdev14-fty-1.txt' (+)
-Network UPS Tools - Generic SNMP UPS driver 1.19 (2.7.4-4727-ga21f32f)
+Network UPS Tools - Generic SNMP UPS driver 1.19 (IPM_Infra_release-1.0.0-6662-g8d66abe)
+device.count: 1
-driver.parameter.synchronous: no
+driver.parameter.synchronous: auto
-driver.version: 2.7.4-4727-ga21f32f
+driver.version: IPM_Infra_release-1.0.0-6662-g8d66abe
+input.feed.color: 0
+input.feed.desc: Feed A
+input.realpower.nominal: 2300
+outlet.1.delay.shutdown: 120
+outlet.1.delay.start: 1
-outlet.1.name: 1
+outlet.1.name: A1
+outlet.1.timer.shutdown: -1
+outlet.1.timer.start: -1
+outlet.10.delay.shutdown: 120
+outlet.10.delay.start: 10
-outlet.10.name: 10
+outlet.10.name: A10
+outlet.10.timer.shutdown: -1
+outlet.10.timer.start: -1
+outlet.11.delay.shutdown: 120
+outlet.11.delay.start: 11
-outlet.11.name: 11
+outlet.11.name: A11
+outlet.11.timer.shutdown: -1
+outlet.11.timer.start: -1
+outlet.12.delay.shutdown: 120
+outlet.12.delay.start: 12
-outlet.12.name: 12
+outlet.12.name: A12
+outlet.12.timer.shutdown: -1
+outlet.12.timer.start: -1
+outlet.13.delay.shutdown: 120
+outlet.13.delay.start: 13
-outlet.13.name: 13
+outlet.13.name: A13
+outlet.13.timer.shutdown: -1
+outlet.13.timer.start: -1
+outlet.14.delay.shutdown: 120
+outlet.14.delay.start: 14
-outlet.14.name: 14
+outlet.14.name: A14
+outlet.14.timer.shutdown: -1
+outlet.14.timer.start: -1
+outlet.15.delay.shutdown: 120
+outlet.15.delay.start: 15
-outlet.15.name: 15
+outlet.15.name: A15
+outlet.15.timer.shutdown: -1
+outlet.15.timer.start: -1
+outlet.16.delay.shutdown: 120
+outlet.16.delay.start: 16
-outlet.16.name: 16
+outlet.16.name: A16
+outlet.16.timer.shutdown: -1
+outlet.16.timer.start: -1
+outlet.2.delay.shutdown: 120
+outlet.2.delay.start: 2
-outlet.2.name: 2
+outlet.2.name: A2
+outlet.2.timer.shutdown: -1
+outlet.2.timer.start: -1
+outlet.3.delay.shutdown: 120
+outlet.3.delay.start: 3
-outlet.3.name: 3
+outlet.3.name: A3
+outlet.3.timer.shutdown: -1
+outlet.3.timer.start: -1
+outlet.4.delay.shutdown: 120
+outlet.4.delay.start: 4
-outlet.4.name: 4
+outlet.4.name: A4
+outlet.4.timer.shutdown: -1
+outlet.4.timer.start: -1
+outlet.5.delay.shutdown: 120
+outlet.5.delay.start: 5
-outlet.5.name: 5
+outlet.5.name: A5
+outlet.5.timer.shutdown: -1
+outlet.5.timer.start: -1
+outlet.6.delay.shutdown: 120
+outlet.6.delay.start: 6
-outlet.6.name: 6
+outlet.6.name: A6
+outlet.6.timer.shutdown: -1
+outlet.6.timer.start: -1
+outlet.7.delay.shutdown: 120
+outlet.7.delay.start: 7
-outlet.7.name: 7
+outlet.7.name: A7
+outlet.7.timer.shutdown: -1
+outlet.7.timer.start: -1
+outlet.8.delay.shutdown: 120
+outlet.8.delay.start: 8
-outlet.8.name: 8
+outlet.8.name: A8
+outlet.8.timer.shutdown: -1
+outlet.8.timer.start: -1
+outlet.9.delay.shutdown: 120
+outlet.9.delay.start: 9
-outlet.9.name: 9
+outlet.9.name: A9
+outlet.9.timer.shutdown: -1
+outlet.9.timer.start: -1
+outlet.group.1.color: 16051527
+outlet.group.1.desc: Branch Circuit A
-outlet.group.1.name: Branch Circuit A
-outlet.group.1.phase: L1
+outlet.group.1.input: 1
+outlet.group.1.name: A
+outlet.group.1.phase: 1

schaal and others added 30 commits July 16, 2017 15:32
…bal vs nut_debug_level_driver vs ultimately used nut_debug_level
…g_min'

This merge unites two similarly targeted PRs:
Closes: networkupstools#683
Closes: networkupstools#349
…nt, and that -D/-d only default to foregrounding now (can be overridden)
… and that -D only defaults to foregrounding now (can be overridden)
…nd that -D only defaults to foregrounding now (can be overridden)
jimklimov and others added 22 commits February 23, 2022 10:59
…vice.0" when in daisy-chain context (skip anyway even for singular devices where we should also walk .1 anyway)
…mber) devices, walk a ".1" device only (should end up querying non-templated OIDs anyway) - avoid walking .0 partially and .1 again for same data
…ng; log the faults (and successes) at level 1
… 1 now, and without a dot-number (to avoid confusion)
… (now by default) so reconnections would be sync
Introduce `synchronous=auto` as new default value for the driver setting
@jimklimov jimklimov force-pushed the FTY-remerge-20220225 branch from 31d02ba to fc5bb14 Compare February 25, 2022 20:13
@jimklimov jimklimov force-pushed the FTY-remerge-20220225 branch from fc5bb14 to 5419eee Compare February 25, 2022 20:29
@jimklimov
Copy link
Member Author

@aquette : Hi, can you take a look what upsets the IPM Jenkins build? Is that something that blocks a PR merge (would the resulting FTY branch be bad material for packaging)?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants