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

Jump to bottom

newdevice: Improve Xerox discovery #5780

Merged
merged 1 commit into from Feb 6, 2017
Merged

newdevice: Improve Xerox discovery #5780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions includes/definitions/xerox.yaml
View file
Open in desktop
Expand Up @@ -6,10 +6,9 @@ type: printer
over:
- { graph: device_toner, text: Toner }
discovery:
- sysDescr:
- Xerox Phaser
- Xerox WorkCentre
- DocuPrint
- sysObjectId:
- .1.3.6.1.4.1.253.8.62.1.
- .1.3.6.1.4.1.297.1.11.93.1.
discovery_modules:
toner: 1
poller_modules:
Expand Down
1 change: 1 addition & 0 deletions tests/OSDiscoveryTest.php
View file
Open in desktop
Expand Up @@ -1574,6 +1574,7 @@ public function testWxgoos()

public function testXerox()
{
$this->checkOS('xerox', 'xerox-color');
$this->checkOS('xerox', 'xerox-phaser');
$this->checkOS('xerox', 'xerox-workcentre');
$this->checkOS('xerox', 'xerox-docuprint');
Expand Down
2 changes: 2 additions & 0 deletions tests/snmpsim/xerox-color.snmprec
View file
Open in desktop
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|Xerox Color 570;System 55.40.61,ESS1.208.6,IOT 64.24.0,FIN C18.22.0,IIT 6.18.0,ADF 12.11.1,SJFI3.0.18,SSMI1.16.0
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.253.8.62.1.20.7.1.1.1
3 changes: 2 additions & 1 deletion tests/snmpsim/xerox-docuprint.snmprec
View file
Open in desktop
@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|FUJI XEROX DocuPrint
1.3.6.1.2.1.1.1.0|4|FUJI XEROX DocuPrint CM305 df; Net 16.41,ESS 201210101131,IOT 03.00.05
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.297.1.11.93.1.32.4.1.1
3 changes: 2 additions & 1 deletion tests/snmpsim/xerox-phaser.snmprec
View file
Open in desktop
@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|Xerox Phaser
1.3.6.1.2.1.1.1.0|4|Xerox Phaser 4600; System 35.004.32.000, MCB 2.50.04.32, Network 4.02.02.08, IOT 0.03.48, IP Core 6.6.3.P
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.253.8.62.1.19.1.24.2.1
3 changes: 2 additions & 1 deletion tests/snmpsim/xerox-workcentre.snmprec
View file
Open in desktop
@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|Xerox WorkCentre
1.3.6.1.2.1.1.1.0|4|Xerox WorkCentre 6605DN; Network 90.66, Controller 201305012030, Engine 02.00.01, Boot 201206111739, PCL5 201304191720, PCL6 201304191720, PostScript 201304232058, PDF 201303061414
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.253.8.62.1.20.6.34.2.1