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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added basic VLAN disco support for Avaya-ERS switches #7098

Merged
merged 7 commits into from Aug 2, 2017
Merged

Added basic VLAN disco support for Avaya-ERS switches #7098

merged 7 commits into from Aug 2, 2017

Commits on Aug 1, 2017

  1. created avaya-ers.inc.php

    Avaya do not use the Q-Bridge MIB for Vlans.
    They also store untagged vlan info in 2 seperate ways:
    rcVlanPortDefaultVlanId stores the actual native VLAN or PVID per switch port.
    rcVlanPortPerformTagging tells us the ports tagging mode, this can be true (all tagged or trunk), false (no tagging or access), 3 (only tag the PVID) or 4 (untag the PVID and tag everything else).
    Due to how these bits of information are presented, for each VLAN ID we then need to loop through all the ports checking if their PVID matches the VLAN ID and if the tagging mode is false or 4. If both are true we add that port to the list of untagged ports for that VLAN.
    tslytsly committed Aug 1, 2017
    Copy the full SHA
    9f65a3c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    d344629 View commit details
    Browse the repository at this point in the history
  3. adding RC-VLAN-MIB

    tslytsly committed Aug 1, 2017
    Copy the full SHA
    6619450 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    bd0e003 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    01fca2e View commit details
    Browse the repository at this point in the history
  6. subtracting 1 from the $port_id value in the egress_ids loop

    This is to fix an off by one error.
    The ERS reports VLAN membership using a bitmask, but the MSB is always 0.
    So using the `q_bridge_bits2indices` function results in the reported ports membership being +1 wrong.
    The best fix for this would be to create a new function exactly the same as `q_bridge_bits2indices` which subtracts the 1 before returning the array. 
    I tried this, but it broke my install :)
    Not sure how to add to the `functions.inc.php` file without breaking it.
    tslytsly committed Aug 1, 2017
    Copy the full SHA
    52f1b53 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Update vlans.inc.php

    laf committed Aug 2, 2017
    Copy the full SHA
    a435c7c View commit details
    Browse the repository at this point in the history