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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Interface config #158

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
7 changes: 7 additions & 0 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
---
requires_ansible: '>=2.11.0' # Use '>=2.9.10' instead, if needed
plugin_routing:
modules:
interfaces_assignments:
redirect: puzzle.opnsense.interfaces_configuration
deprecation:
message: 'Use puzzle.opnsense.interfaces_configuration instead'
removal_version: '2.0.0'
8 changes: 1 addition & 7 deletions plugins/module_utils/firewall_alias_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from ansible_collections.puzzle.opnsense.plugins.module_utils.system_access_users_utils import (
Group,
)
from ansible_collections.puzzle.opnsense.plugins.module_utils.interfaces_assignments_utils import (
from ansible_collections.puzzle.opnsense.plugins.module_utils.interfaces_configuration_utils import ( # pylint: disable=C0301
InterfacesSet,
)
from ansible_collections.puzzle.opnsense.plugins.module_utils.enum_utils import ListEnum
Expand Down Expand Up @@ -109,7 +109,6 @@ class FirewallAlias:

# pylint: disable=too-many-instance-attributes
def __init__(self, **kwargs):

# set default attributes
self.uuid: Optional[str] = kwargs.get("uuid", str(uuid.uuid4()))
self.enabled: bool = True
Expand All @@ -135,7 +134,6 @@ def __post_init__(self):

# Check if the value is a string and the field_type is a subclass of ListEnum
if isinstance(value, str) and issubclass(field_type, ListEnum):

# Convert string to ListEnum
setattr(self, field_name, field_type.from_string(value))

Expand Down Expand Up @@ -270,7 +268,6 @@ def to_etree(self) -> Element:
del firewall_alias_dict["uuid"]

for alias_key, alias_val in firewall_alias_dict.copy().items():

if alias_key in ["enabled", "counters"]:
firewall_alias_dict[alias_key] = "0" if alias_val is False else "1"
continue
Expand Down Expand Up @@ -504,7 +501,6 @@ def set_authgroup(self, type_opnvpngroup_alias: FirewallAlias) -> None:

gid_content = []
for group in type_opnvpngroup_alias.content:

gid_content.append(
next((g for g in self.group_list if g.name == group), None).gid
)
Expand Down Expand Up @@ -608,7 +604,6 @@ def validate_content(
}

for content_value in content_values:

# since not all types need validation, unhandled types are ingnored
if not content_type_map.get(content_type.value):
return True
Expand All @@ -618,7 +613,6 @@ def validate_content(
)

if not validation_function(content_value):

raise OPNsenseContentValidationError(
content_type_map[content_type.value]["error_message"].format(
entry=content_value
Expand Down
Loading
Loading