dhcp interface <if> expire のデフォルト値を書き出す。

seil3 のデフォルト値は 24、seil6/8 のデフォルト値は 12 と異なるため、
expire が指定されていなかった場合には "24" を書く必要がある。

Author: tsahara

seil2recipe.js

@@ -711,6 +711,13 @@ class TreeConfig {
         }
     }
 
+    set_default(labels, val, conv) {
+        if (this.get(labels)) {
+            return;
+        }
+        this.set(labels, val, conv);
+    }
+
     set_params(labels, params, conv) {
         const name = params['*NAME*'];
         for (const key in params) {
@@ -728,9 +735,17 @@ class TreeConfig {
     }
 
     expand() {
+        this.expand_dhcp();
         this.expand_floatlink();
     }
 
+    expand_dhcp() {
+        for (const [ifname, cval] of this.match(['dhcp', 'interface', '*', 'expire'])) {
+            const k = dhcp_get_interface(cval.conv, ifname);
+            cval.conv.add(`${k}.expire`, cval.str);
+        }
+    }
+
     expand_floatlink() {
         const ns = this.get(['floatlink', 'name-service']);
         if (ns == null) {
@@ -1470,13 +1485,14 @@ Converter.rules['dhcp'] = {
                 const idx = conv.if2index('dhcp.interface', ifname);
                 conv.set_memo(`dhcp.interface.${idx}`, true);
                 conv.add(`dhcp.${mode}.${idx}.interface`, ifname);
+                if (mode == 'server') {
+                    conv.tconf.set_default(['dhcp', 'interface', tokens[2], 'expire'], "24", conv);
+                }
             },
 
             'expire': (conv, tokens) => {
                 const k = dhcp_get_interface(conv, tokens[2]);
-                if (k) {
-                    conv.add(`${k}.expire`, tokens[4]);
-                }
+                conv.tconf.set(['dhcp', 'interface', tokens[2], 'expire'], tokens[4], conv);
             },
 
             'gateway': (conv, tokens) => {

test/test.js

@@ -450,16 +450,36 @@ describe('dhcp', () => {
             dhcp enable
             dhcp mode server
             dhcp interface lan0 enable
+            dhcp interface lan0 expire 24
             dhcp interface lan0 pool 192.168.0.10 30
             ---
             interface.ge1.ipv4.address: 192.168.0.254/24
             dhcp.server.service: enable
+            dhcp.server.100.expire: 24
+            dhcp.server.100.interface: ge1
             dhcp.server.100.pool.address: 192.168.0.10/24
             dhcp.server.100.pool.count: 30
+        `);
+    });
+
+    it('expire default value has been changed (24 -> 12)', () => {
+        assertconv(`
+            interface lan0 add 192.168.0.1/24
+            dhcp enable
+            dhcp mode server
+            dhcp interface lan0 enable
+            dhcp interface lan0 pool 192.168.0.2 253
+            ---
+            interface.ge1.ipv4.address: 192.168.0.1/24
+            dhcp.server.service: enable
             dhcp.server.100.interface: ge1
+            dhcp.server.100.expire: 24
+            dhcp.server.100.pool.address: 192.168.0.2/24
+            dhcp.server.100.pool.count: 253
         `);
     });
 
+
     it('relay enable/disable', () => {
         assertconv(`
             dhcp enable