Skip to content
Snippets Groups Projects
Commit 0a1d7246 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge !1500: datamodel: support interface names with dashes

Fixes #900
parents 3d41cb85 61454b13
No related branches found
No related tags found
1 merge request!1500datamodel: support interface names with dashes
Pipeline #122343 waiting for manual action
Pipeline: Knot Resolver

#122344

    Knot Resolver 6.0.7 (2024-0m-dd)
    ================================
    Bugfixes
    --------
    - fix listening by interface name containing dashes (#900, !1500)
    Knot Resolver 6.0.6 (2024-02-13)
    ================================
    ......
    ......@@ -31,7 +31,7 @@ net.listen(
    {%- if interface.addr -%}
    '{{ interface.addr }}',
    {%- elif interface.if_name -%}
    net.{{ interface.if_name }},
    net['{{ interface.if_name }}'],
    {%- endif -%}
    {%- if interface.port -%}
    {{ interface.port }},
    ......
    ......@@ -26,10 +26,10 @@ def test_network_listen():
    )
    intrfc = ListenSchema({"interface": "eth0", "kind": "doh2"})
    assert tmpl.render(listen=intrfc) == "net.listen(net.eth0,443,{kind='doh2',freebind=false})\n"
    assert tmpl.render(listen=intrfc) == "net.listen(net['eth0'],443,{kind='doh2',freebind=false})\n"
    intrfc_list = ListenSchema({"interface": [intrfc.interface.to_std()[0], "lo"], "port": 5555, "kind": "doh2"})
    assert (
    tmpl.render(listen=intrfc_list)
    == "net.listen(net.eth0,5555,{kind='doh2',freebind=false})\n"
    + "net.listen(net.lo,5555,{kind='doh2',freebind=false})\n"
    == "net.listen(net['eth0'],5555,{kind='doh2',freebind=false})\n"
    + "net.listen(net['lo'],5555,{kind='doh2',freebind=false})\n"
    )
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment