[OpenWrt] Simplified automatic name generation #50

openwisp · May 16, 2016 · 6be40d9 · 6be40d9
1 parent 3784643
commit 6be40d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/source/backends/openwrt.rst b/docs/source/backends/openwrt.rst
@@ -2021,7 +2021,7 @@ Will be rendered as follows::
 
     package dropbear
 
-    config dropbear 'dropbear_dropbear1'
+    config dropbear 'dropbear_1'
             option PasswordAuth 'on'
             option Port '22'
             option RootPasswordAuth 'on'

diff --git a/netjsonconfig/backends/openwrt/templates/default.uci b/netjsonconfig/backends/openwrt/templates/default.uci
@@ -3,7 +3,7 @@
         package {{ package }}
 
         {% for config in config_blocks %}
-            config {{ config.config_name }} '{% if config.config_value %}{{ config.config_value }}{% else %}{{ package }}_{{ config.config_name }}{{ loop.index }}{% endif %}'
+            config {{ config.config_name }} '{% if config.config_value %}{{ config.config_value }}{% else %}{{ config.config_name }}_{{ loop.index }}{% endif %}'
             {% for key, value in config.items() %}
                 {% if value not in ['', None] and not key.startswith('config_') %}
                     {% if value is not string and value is iterable %}

diff --git a/tests/openwrt/test_default.py b/tests/openwrt/test_default.py
@@ -58,7 +58,7 @@ def test_default(self):
         })
         expected = self._tabs("""package firewall
 
-config rule 'firewall_rule1'
+config rule 'rule_1'
     option family 'ipv6'
     list icmp_type '130/0'
     list icmp_type '131/0'
@@ -70,7 +70,7 @@ def test_default(self):
     option src_ip 'fe80::/10'
     option target 'ACCEPT'
 
-config rule 'firewall_rule2'
+config rule 'rule_2'
     option family 'ipv4'
     list icmp_type '130/0'
     list icmp_type '131/0'