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.

Sign up for GitHub

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

Jump to bottom

Added a way to handle 4096/4096 and 0 #98

Merged
merged 12 commits into from
Mar 9, 2023
Merged

Added a way to handle 4096/4096 and 0 #98

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e79833
Added a way to handle `vlanId` as str
Alopalao Feb 8, 2023
f2609cc
Changed MatchDLVLAN
Alopalao Feb 8, 2023
fc66672
Changed MatchDLVLAN to not overwrite '0/0'
Alopalao Feb 8, 2023
2759cd0
Revert "Changed MatchDLVLAN to not overwrite '0/0'"
Alopalao Feb 9, 2023
3bd2dd1
Modified from_of_tlv() to ignore 4096
Alopalao Feb 15, 2023
dcec34d
Fixed linter
Alopalao Feb 15, 2023
177a3d7
Added tests for `any` and `untagged` cases
Alopalao Feb 21, 2023
7eff1e5
Merge branch 'master' into untagged_uni
Alopalao Feb 21, 2023
7b4a04f
Adding docstrings
Alopalao Mar 1, 2023
f986e24
Merge branch 'master' into untagged_uni
Alopalao Mar 1, 2023
f9103c1
Updated changelog
Alopalao Mar 3, 2023
c15868f
Update CHANGELOG.rst
Alopalao Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions v0x04/match_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@ def as_of_tlv(self):
value = int(self.value)
mask = None
oxm_hasmask = False
value = value | VlanId.OFPVID_PRESENT
except ValueError:
value, mask = map(int, self.value.split('/'))
oxm_hasmask = True
value = value | VlanId.OFPVID_PRESENT
try:
value, mask = map(int, self.value.split('/'))
oxm_hasmask = True
value = value | VlanId.OFPVID_PRESENT
except ValueError:
mask = None
oxm_hasmask = False
value = VlanId.OFPVID_NONE
Alopalao marked this conversation as resolved.
Show resolved Hide resolved
value_bytes = value.to_bytes(2, 'big')
if mask:
Alopalao marked this conversation as resolved.
Show resolved Hide resolved
mask = mask | VlanId.OFPVID_PRESENT
Expand Down