Skip to content

Add IP version constraint #103

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

Draft
cavokz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add IP version constraint #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions geneve/constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,12 @@ def solve_date_constraints(self, field, value, constraints, left_attempts):
left_attempts -= 1
return {"value": value, "left_attempts": left_attempts}

@solver("ip", "==", "!=", "in", "not in")
@solver("ip", "==", "!=", "in", "not in", "version")
def solve_ip_constraints(self, field, value, constraints, left_attempts):
include_nets = set()
exclude_nets = set()
exclude_addrs = set()
ip_versions = []

for k, v, *_ in constraints:
if k == "==":
Expand Down Expand Up @@ -352,6 +353,16 @@ def solve_ip_constraints(self, field, value, constraints, left_attempts):
exclude_nets.add(ipaddress.ip_network(str(v)))
except ValueError:
raise ValueError(f"Not an IP network: {str(v)}")
elif k == "version":
if type(v) is tuple:
if len(v) > 1:
raise ValueError(f"Too many arguments for version of '{field}': {v}")
v = v[0]
v = int(v)
if v not in (4, 6):
raise ValueError(f"Not an valid IP version: {v}")
if v not in ip_versions:
ip_versions = sorted(ip_versions + [v])

if include_nets & exclude_nets:
intersecting_nets = ", ".join(str(net) for net in sorted(include_nets & exclude_nets))
Expand All @@ -368,7 +379,8 @@ def solve_ip_constraints(self, field, value, constraints, left_attempts):
else:
exclude_nets = ", ".join(str(v) for v in sorted(exclude_nets))
raise ConflictError(f"cannot be in any of nets ({exclude_nets})", field)
ip_versions = sorted(ip.version for ip in include_nets | exclude_nets | exclude_addrs) or [4]
if not ip_versions:
ip_versions = sorted(ip.version for ip in include_nets | exclude_nets | exclude_addrs) or [4]
include_nets = sorted(include_nets, key=lambda x: (x.version, x))
while left_attempts and (
value in (None, [])
Expand Down
2 changes: 2 additions & 0 deletions geneve/events_emitter_eql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ def cc_function_call(node: eql.ast.FunctionCall, negate: bool) -> Root:
return cc_function(node, negate, "in")
elif fn_name == "_cardinality":
return cc_function(node, negate, "cardinality")
elif fn_name == "_version":
return cc_function(node, negate, "version")
else:
raise NotImplementedError(f"Unsupported function: {node.name}")

Expand Down