Correctly parse IFLA_VLAN_PROTOCOL in IPDB interface #393
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
|
Thanks a lot! Will be merged tomorrow. |
|
Can you please verify that if this has any impact on #361 My tests might be inconsistent and messy, but compared to pyroute2 0.4.18 this seems to work: This is qinq.py (with ipdb): from pyroute2 import IPDB, NetNS
ipdb = IPDB()
# create host dummy
ipdb.create(kind="dummy", ifname="qtest").commit()
hidx = ipdb.interfaces['qtest']
# create 802.1ad s-vlan interface (external tag)
ipdb.create(kind="vlan", ifname="qtest.50", link=hidx, vlan_id=50, vlan_protocol=0x88a8).commit()
# create 802.1q c-vlan interface (internal tag)
ipdb.create(kind="vlan", ifname="qtest.50.120", link=hidx, vlan_id=120, vlan_protocol=0x8100).commit()
# print the links
for link in (ipdb.interfaces['qtest.50'], ipdb.interfaces['qtest.50.120']):
print(link.ifname)
print("\t%s" % (link.vlan_protocol))Vanilla pyroute 0.4.18notice both devices created as type 802.1Q (even though qinq.py displays otherwise) After applying the patch (git master + pr):** both devices created correctly** I would love to hear your opinion regarding this issue. Thanks! |
svinota
added a commit
that referenced
this pull request
Jul 14, 2017
|
Since there is no automatic mapping between NLAs — that may have really weird layout sometimes, as there is no standard — and «flat» IPDB dictionaries, we have to explicitly tell, how to load some specific attributes. Your solution is exactly what I would do to fix the issue. Thanks a lot! Also, notice the test code added to cover the issue: 9a2e02c |
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.
In issue #361 the example file qinq.zip works with IPRoute.
When trying the same with IPDB, parsing the result when committing an interface with vlan_protocol fails:
This fixes the issue for me.
This is the modified qinq.py: