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

Feature: Adding VRP support for FDB table using HUAWEI-L2MAM-MIB #8719

Merged
merged 12 commits into from May 19, 2018

Conversation

Projects
None yet
3 participants
@PipoCanaja
Copy link
Contributor

PipoCanaja commented May 15, 2018

Hello

Here is the code to load the FDB table using the Huawei MIB. Because the switch does not answer to Q-BRIDGE at all, and BRIDGE MIB does not provide the vlan information.

The test data (if necessary) will come after the other PR (POE polling) is merged, to have a test file including all.

Bye

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

@laf
Copy link
Member

laf left a comment

Can you add some test data for a vrp device uses this please: https://docs.librenms.org/#Developing/os/Test-Units/#example-workflow

/**
* vrp.inc.php
*
* Discover FDB data with HUAWEI-L2MAM-MIB

This comment has been minimized.

@laf

laf May 15, 2018

Member

Could you update your copyright to use this template please:

https://docs.librenms.org/#Developing/Licensing/#copyright

This comment has been minimized.

@PipoCanaja

PipoCanaja May 15, 2018

Author Contributor

Done

}
}
echo PHP_EOL;

This comment has been minimized.

@laf

laf May 15, 2018

Member

Any reason for this? Probably better to add it to echo 'HUAWEI-L2MAM-MIB:'; instead.

This comment has been minimized.

@PipoCanaja

PipoCanaja May 15, 2018

Author Contributor

I did a "cp bridge.inc.php vrp.inc.php"... This is the only reason :) I'll correct it.

This comment has been minimized.

@PipoCanaja

PipoCanaja May 15, 2018

Author Contributor

Correct done. Validation ongoing.

PipoCanaja and others added some commits May 15, 2018

murrant added some commits May 16, 2018

@murrant

This comment has been minimized.

Copy link
Member

murrant commented May 16, 2018

We don't support tests for the fdb-table module yet, added in #8723

@PipoCanaja

This comment has been minimized.

Copy link
Contributor Author

PipoCanaja commented May 16, 2018

@murrant OK.

How should I proceed then ? I wait until #8723 is merged ?

PipoCanaja

@PipoCanaja

This comment has been minimized.

Copy link
Contributor Author

PipoCanaja commented May 17, 2018

Hi @murrant and @laf

Just a check to understand what's going on: the basic pre-commit test works but the advanced one (with test data) does not. When trying it on my machine, I get errors that do not seem to be related directly to this patch.So, the changes that are going on with the tests are impacting this merge ?
If yes, could you let me know if there is something else I can do ?
Thanx
PipoCanaja

@murrant

This comment has been minimized.

Copy link
Member

murrant commented May 19, 2018

@PipoCanaja It is a problem with the sql query to capture the data. I need to update it but haven't had any type yet.

@laf

laf approved these changes May 19, 2018

@laf laf merged commit f663f8d into librenms:master May 19, 2018

3 checks passed

WIP ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@laf laf added Device 🖥 and removed Needs Tests 🦄 labels May 19, 2018

@PipoCanaja PipoCanaja deleted the PipoCanaja:VRP_Fdb_Discovery branch May 19, 2018

mattie47 added a commit to mattie47/librenms that referenced this pull request Jul 2, 2018

device: Added FDB table support for VRP using HUAWEI-L2MAM-MIB (libre…
…nms#8719)

* Adding VRP support for FDB table using HUAWEI-L2MAM-MIB

* Test data + review corrections

* Test data correction

* Remove double text

* PHP EOL at the right spot

* Rename vrp_5720.fdb.snmprec to vrp_5720.snmprec

* Update vrp_5720.snmprec

* Create vrp_5720.json

* Update vrp_5720.json

* Update vrp_5720.json

* Fix fdb query, test data, and mibs

@lock lock bot locked as resolved and limited conversation to collaborators Jul 18, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
You can’t perform that action at this time.