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

newdevice: Add Calix AXOS/E5-16F Detection #6926

Merged
merged 5 commits into from Jul 5, 2017

Conversation

Projects
None yet
6 participants
@djamp42
Contributor

djamp42 commented Jun 30, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

@CLAassistant

This comment has been minimized.

Show comment
Hide comment
@CLAassistant

CLAassistant Jun 30, 2017

CLA assistant check
All committers have signed the CLA.

CLAassistant commented Jun 30, 2017

CLA assistant check
All committers have signed the CLA.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jun 30, 2017

Auto-Deploy finished, Test PR at http://6926.ci.librenms.org or https://6926.ci.librenms.org

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Jun 30, 2017

Member

Does AXOS use the same mibs as E7?

Also, this should probably be more generic like .1.3.6.1.4.1.6321.1.2.4.
And you need to add an additional snmprec file: http://docs.librenms.org/Developing/os/Test-Units/

Member

murrant commented Jun 30, 2017

Does AXOS use the same mibs as E7?

Also, this should probably be more generic like .1.3.6.1.4.1.6321.1.2.4.
And you need to add an additional snmprec file: http://docs.librenms.org/Developing/os/Test-Units/

@djamp42

This comment has been minimized.

Show comment
Hide comment
@djamp42

djamp42 Jun 30, 2017

Contributor

I'm trying to get the MIBs, but I believe they are different, as AXOS is the new software Calix is going to.
I'm not sure what you mean by more generic, as that OID is the same one i have.
For the snmpprec file, the sysDescr returns the model number but also includes the version number of the AXOS software installed, so i'm not sure how you handle this as E5-16F could have different versions of the AXOS software on it.

1.3.6.1.2.1.1.1.0|4|Calix, Inc E5-16F AXOS-R2.2.0
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6321.1.2.4.1.4

Contributor

djamp42 commented Jun 30, 2017

I'm trying to get the MIBs, but I believe they are different, as AXOS is the new software Calix is going to.
I'm not sure what you mean by more generic, as that OID is the same one i have.
For the snmpprec file, the sysDescr returns the model number but also includes the version number of the AXOS software installed, so i'm not sure how you handle this as E5-16F could have different versions of the AXOS software on it.

1.3.6.1.2.1.1.1.0|4|Calix, Inc E5-16F AXOS-R2.2.0
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6321.1.2.4.1.4

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Jun 30, 2017

Member

I mean we match by the start of the sysObectID string, so 1.3.6.1.4.1.6321.1.2.4. will likely match every AXOS device, not just E5-16F. (I had a typo in my message earlier)

We probably need to start a new OS for AXOS if they have different MIBs. I suggest calix-axos

The snmprec data is only used for testing to make sure we don't break os detection for devices. What you have there is correct.

Member

murrant commented Jun 30, 2017

I mean we match by the start of the sysObectID string, so 1.3.6.1.4.1.6321.1.2.4. will likely match every AXOS device, not just E5-16F. (I had a typo in my message earlier)

We probably need to start a new OS for AXOS if they have different MIBs. I suggest calix-axos

The snmprec data is only used for testing to make sure we don't break os detection for devices. What you have there is correct.

@djamp42

This comment has been minimized.

Show comment
Hide comment
@djamp42

djamp42 Jul 1, 2017

Contributor

I just checked and it uses the same mibs as the e7. It actually uses less.

Contributor

djamp42 commented Jul 1, 2017

I just checked and it uses the same mibs as the e7. It actually uses less.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jul 1, 2017

Auto-Deploy finished, Test PR at http://6926.ci.librenms.org or https://6926.ci.librenms.org

@murrant murrant changed the title from Add Calix AXOS/E5-16F Detection to newdevice: Add Calix AXOS/E5-16F Detection Jul 1, 2017

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jul 1, 2017

Auto-Deploy finished, Test PR at http://6926.ci.librenms.org or https://6926.ci.librenms.org

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jul 1, 2017

Member

So should we do this as a new OS axos.yaml if that's what this device runs?

Member

laf commented Jul 1, 2017

So should we do this as a new OS axos.yaml if that's what this device runs?

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Jul 2, 2017

Member

AXOS is basically the SDN (They like to call it SDA) platform for Calix. I don't think it is far off from their current E7 platform at the underpinnings.

I just checked the MIBs. CALIX-PRODUCT-MIB and CALIX-SMI are the only custom MIBs they provide. They cover both product lines.

I think it would make sense to have them separate, just in case.

Member

murrant commented Jul 2, 2017

AXOS is basically the SDN (They like to call it SDA) platform for Calix. I don't think it is far off from their current E7 platform at the underpinnings.

I just checked the MIBs. CALIX-PRODUCT-MIB and CALIX-SMI are the only custom MIBs they provide. They cover both product lines.

I think it would make sense to have them separate, just in case.

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jul 2, 2017

Member

You confused me then as the email notification said no but this says yes :)

@djamp42 if you can split this off into a new os called axos that would be ace, if you don't have time let us know and one of us will sort it out.

Member

laf commented Jul 2, 2017

You confused me then as the email notification said no but this says yes :)

@djamp42 if you can split this off into a new os called axos that would be ace, if you don't have time let us know and one of us will sort it out.

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Jul 2, 2017

Member

@laf changed my mind and edited post.

Member

murrant commented Jul 2, 2017

@laf changed my mind and edited post.

@djamp42

This comment has been minimized.

Show comment
Hide comment
@djamp42

djamp42 Jul 2, 2017

Contributor

@laf I would rather you do it, just because I'm not a programmer by trade. If you need any other device info let me know.

Contributor

djamp42 commented Jul 2, 2017

@laf I would rather you do it, just because I'm not a programmer by trade. If you need any other device info let me know.

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jul 2, 2017

Member

@djamp42 I've update this now, please test the update to make sure it does what you need.

I've removed what appears to be non-relevant discovery for models in the calix range so this is limited. If you find it's missing something that was there when it was calix then let me know.

Member

laf commented Jul 2, 2017

@djamp42 I've update this now, please test the update to make sure it does what you need.

I've removed what appears to be non-relevant discovery for models in the calix range so this is limited. If you find it's missing something that was there when it was calix then let me know.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jul 2, 2017

Auto-Deploy finished, Test PR at http://6926.ci.librenms.org or https://6926.ci.librenms.org

@djamp42

This comment has been minimized.

Show comment
Hide comment
@djamp42

djamp42 Jul 3, 2017

Contributor

Thanks, Works fine, just added another E5 and was detected as Calix with this pull request.

Contributor

djamp42 commented Jul 3, 2017

Thanks, Works fine, just added another E5 and was detected as Calix with this pull request.

@murrant

murrant approved these changes Jul 5, 2017

@laf laf merged commit 394c439 into librenms:master Jul 5, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Jul 5, 2017

The inspection completed: No new issues

scrutinizer-notifier commented Jul 5, 2017

The inspection completed: No new issues

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jul 5, 2017

Member

Thanks for the pull request @djamp42 :)

image

Member

laf commented Jul 5, 2017

Thanks for the pull request @djamp42 :)

image

@djamp42 djamp42 deleted the djamp42:patch-1 branch Jul 6, 2017

@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 17, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

lock bot commented May 17, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 17, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.