Skip to content

Commit fb00604

Browse files
committed
[airos] renamed dhcp converter to match section name
1 parent 4d21b13 commit fb00604

4 files changed

Lines changed: 52 additions & 6 deletions

File tree

netjsonconfig/backends/airos/airos.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from collections import OrderedDict
22

33
from ..base.backend import BaseBackend
4-
from .converters import (Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, Httpd,
5-
Igmpproxy, Iptables, Netconf, Netmode, Ntpclient,
6-
Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog,
7-
System, Telnetd, Tshaper, Unms, Update, Users, Vlan,
8-
Wireless, Wpasupplicant)
4+
from .converters import (Aaa, Bridge, Dhcpc, Discovery, Dyndns, Ebtables, Gui,
5+
Httpd, Igmpproxy, Iptables, Netconf, Netmode,
6+
Ntpclient, Pwdog, Radio, Resolv, Route, Snmp, Sshd,
7+
Syslog, System, Telnetd, Tshaper, Unms, Update, Users,
8+
Vlan, Wireless, Wpasupplicant)
99
from .intermediate import flatten, intermediate_to_list
1010
from .renderers import AirOsRenderer
1111
from .schema import schema

netjsonconfig/backends/airos/converters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def to_intermediate(self):
122122
return (('discovery', result),)
123123

124124

125-
class Dhcp(AirOsConverter):
125+
class Dhcpc(AirOsConverter):
126126

127127
@classmethod
128128
def should_run_forward(cls, config):

tests/airos/mock.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from netjsonconfig import AirOs
44
from netjsonconfig.backends.airos.airos import to_ordered_list
55
from netjsonconfig.backends.airos.converters import (Aaa, Bridge, Discovery,
6+
Dhcpc,
67
Dyndns, Ebtables, Gui,
78
Httpd, Igmpproxy,
89
Iptables, Netconf,
@@ -57,6 +58,15 @@ class BridgeAirOs(AirOs):
5758
]
5859

5960

61+
class DhcpcAirOs(AirOs):
62+
"""
63+
Mock backend with converter for network hardware discovery
64+
"""
65+
converters = [
66+
Dhcpc,
67+
]
68+
69+
6070
class DiscoveryAirOs(AirOs):
6171
"""
6272
Mock backend with converter for network hardware discovery

tests/airos/test_dhcpc.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
from .mock import ConverterTest, DhcpcAirOs
2+
3+
4+
class TestNetmodeConverter(ConverterTest):
5+
6+
backend = DhcpcAirOs
7+
8+
def test_bridge(self):
9+
o = self.backend({
10+
'netmode': 'bridge',
11+
})
12+
o.to_intermediate()
13+
14+
with self.assertRaises(KeyError):
15+
o.intermediate_data['dhcpc']
16+
17+
def test_router(self):
18+
o = self.backend({
19+
'netmode': 'router',
20+
})
21+
o.to_intermediate()
22+
expected = [
23+
{
24+
'status': 'enabled',
25+
},
26+
[
27+
{
28+
'devname': 'br0',
29+
'fallback': '192.168.10.1',
30+
'fallback_netmask': '255.255.255.0',
31+
'status': 'enabled',
32+
},
33+
]
34+
]
35+
36+
self.assertEqualConfig(o.intermediate_data['dhcpc'], expected)

0 commit comments

Comments
 (0)