-
-
Notifications
You must be signed in to change notification settings - Fork 39
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
Common graph integrations #145
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he test-bed. Not ready for use. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…stem a bit. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
… and the children rearranged to preserve speed limits in a sane manner (so a shared relay can have X for one customer, Y for another and Z as a limit) Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…dividual steps private methods. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…result. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…mented once again. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
… yet. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…P integration. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…n-mapped circuits needing to go to the top. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…on system. Add unit tests to ensure that it works. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
… on node add. That makes it work across all integrations. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
… own integration. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
…ented, and uses the NetworkGraph framework. I'm going to have to find some more test data to make sure it actually works. Signed-off-by: Herbert Wolverson <herberticus@gmail.com>
Awesome work! Thank you so much. I did notice two things:
So this one's fixed. =)
Is there any way to have integrationUISP.py and integrationCommon.py use the UISP subscriber site ID as the Circuit ID by default - so it doesn't change each time? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the work I've been doing on the integration system in general, and UISP/Spylnx in particular.
Rather than duplicate work between integrations, a lot of common functionality is now in
integrationCommon.py
. Integrations start by making a newNetworkGraph
object, and adding nodes to it. Nodes can be sites, APs, or clients. While adding, fill in anid
field and aparentId
field. Once added, callingprepareGraph()
builds the tree. You can then output thenetwork.json
file withcreateNetworkJson
and theShapedDevices.csv
file withcreateShapedDevices()
.There is also support for using
graphviz
(if you have it installed) to produce a network map of the discovered topology. If you don't have it installed, it skips this step.There are also a bunch of unit tests.
This has been tested against UISP, and the test Splynx (Spylnx support is a bit limited, making a flat network only). UISP integration mode can be set with
uispStrategy
inispConfig.py
. "full" will attempt to map the network based on data-links, and "flat" will generate a simple, flat topology.