otgnet stubs

PKGBUILD

@@ -59,6 +59,8 @@ depends=(
 	make
 	patch
 	sudo
+	iptables
+	iproute2
 	"raspberrypi-io-access>=0.5"
 	"ustreamer>=1.19"
 )

kvmd/apps/__init__.py

@@ -77,7 +77,9 @@ from ..validators.os import valid_command
 
 from ..validators.net import valid_ip_or_host
 from ..validators.net import valid_ip
+from ..validators.net import valid_net
 from ..validators.net import valid_port
+from ..validators.net import valid_ports_list
 from ..validators.net import valid_mac
 from ..validators.net import valid_ssl_ciphers
 
@@ -426,6 +428,26 @@ def _get_config_scheme() -> Dict:
             },
         },
 
+        "otgnet": {
+            "iface": {
+                "net": Option("169.254.0.100/31", type=functools.partial(valid_net, v6=False)),
+            },
+
+            "firewall": {
+                "allow_tcp": Option([], type=valid_ports_list),
+                "allow_udp": Option([], type=valid_ports_list),
+            },
+
+            "dhcp": {
+                "enabled": Option(True, type=valid_bool),
+            },
+
+            "commands": {
+                "ip_cmd": Option(["/usr/bin/ip"], type=valid_command),
+                "iptables_cmd": Option(["/usr/bin/iptables"], type=valid_command),
+            },
+        },
+
         "ipmi": {
             "server": {
                 "host":    Option("::", type=valid_ip_or_host),

kvmd/validators/net.py

@@ -28,11 +28,13 @@ from typing import Callable
 from typing import Any
 
 from . import ValidatorError
+from . import raise_error
 from . import check_re_match
 from . import check_any
 
 from .basic import valid_number
 from .basic import valid_stripped_string_not_empty
+from .basic import valid_string_list
 
 
 # =====
@@ -66,6 +68,26 @@ def valid_ip(arg: Any, v4: bool=True, v6: bool=True) -> str:
     )
 
 
+def valid_net(arg: Any, v4: bool=True, v6: bool=True) -> str:
+    assert v4 or v6
+    validators: List[Callable] = []
+    versions: List[str] = []
+    if v4:
+        validators.append(lambda arg: str(ipaddress.IPv4Network(arg)))
+        versions.append("4")
+    if v6:
+        validators.append(lambda arg: str(ipaddress.IPv6Network(arg)))
+        versions.append("6")
+    name = f"IPv{'/'.join(versions)} network"
+    if "/" not in str(arg):
+        raise_error(arg, name)
+    return check_any(
+        arg=valid_stripped_string_not_empty(arg, name),
+        name=name,
+        validators=validators,
+    )
+
+
 def valid_rfc_host(arg: Any) -> str:
     # http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address
     pattern = r"^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*" \
@@ -77,6 +99,10 @@ def valid_port(arg: Any) -> int:
     return int(valid_number(arg, min=0, max=65535, name="network port"))
 
 
+def valid_ports_list(arg: Any) -> List[int]:
+    return list(map(int, valid_string_list(arg, subval=valid_port, name="ports list")))
+
+
 def valid_mac(arg: Any) -> str:
     pattern = ":".join([r"[0-9a-fA-F]{2}"] * 6)
     return check_re_match(arg, "MAC address", pattern).lower()

testenv/tests/validators/test_net.py

@@ -20,6 +20,7 @@
 # ========================================================================== #
 
 
+from typing import List
 from typing import Any
 
 import pytest
@@ -27,8 +28,10 @@ import pytest
 from kvmd.validators import ValidatorError
 from kvmd.validators.net import valid_ip_or_host
 from kvmd.validators.net import valid_ip
+from kvmd.validators.net import valid_net
 from kvmd.validators.net import valid_rfc_host
 from kvmd.validators.net import valid_port
+from kvmd.validators.net import valid_ports_list
 from kvmd.validators.net import valid_mac
 from kvmd.validators.net import valid_ssl_ciphers
 
@@ -86,6 +89,37 @@ def test_fail__valid_ip(arg: Any) -> None:
         print(valid_ip(arg))
 
 
+# =====
+@pytest.mark.parametrize("arg", [
+    "127.0.0.0/24 ",
+    "8.8.8.8/31",
+    "::/16",
+    "::ffff:0:0:0/96",
+    "64:ff9b::/96",
+])
+def test_ok__valid_net(arg: Any) -> None:
+    assert valid_net(arg) == arg.strip()
+
+
+@pytest.mark.parametrize("arg", [
+    "127.0.0.1/33",
+    "127.0.0.1/0",
+    "127.0.0.1/",
+    "127.0.0.1",
+    "8.8.8.8//31",
+    "ya.ru",
+    "1",
+    "1.1.1",
+    "1.1.1.",
+    ":",
+    "",
+    None,
+])
+def test_fail__valid_net(arg: Any) -> None:
+    with pytest.raises(ValidatorError):
+        print(valid_net(arg))
+
+
 # =====
 @pytest.mark.parametrize("arg", [
     "yandex.ru ",
@@ -124,6 +158,26 @@ def test_fail__valid_port(arg: Any) -> None:
         print(valid_port(arg))
 
 
+# =====
+@pytest.mark.parametrize("arg, retval", [
+    ("",            []),
+    (",, , ",       []),
+    ("0 ",          [0]),
+    ("1,",          [1]),
+    ("22,23",       [22, 23]),
+    ("80,443,443,", [80, 443, 443]),
+    (65535,         [65535]),
+])
+def test_ok__valid_ports_list(arg: Any, retval: List[int]) -> None:
+    assert valid_ports_list(arg) == retval
+
+
+@pytest.mark.parametrize("arg", ["test", "13,test", None, 1.1])
+def test_fail__valid_ports_list(arg: Any) -> None:
+    with pytest.raises(ValidatorError):
+        print(valid_ports_list(arg))
+
+
 # =====
 @pytest.mark.parametrize("arg", [
     " 00:00:00:00:00:00 ",