From 9566a0d6705fb0550ad47588c56d6e794d643a0b Mon Sep 17 00:00:00 2001
From: chirac <chirac@re2o-services.crans.org>
Date: Mon, 9 Jul 2018 00:12:38 +0200
Subject: [PATCH] Formatage de certains options non correct

---
 templates/hp.tpl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/hp.tpl b/templates/hp.tpl
index 091afda..bfc72b7 100644
--- a/templates/hp.tpl
+++ b/templates/hp.tpl
@@ -3,7 +3,9 @@
 hostname "{{ switch.short_name }}"
 ; Generated on {{ date_gen }} by re2o
 ;--- Snmp ---
+{%- if switch.switchbay.name %}
 snmp-server location "{{ switch.switchbay.name }}"
+{%- endif %}
 ;A faire à la main
 snmpv3 enable
 snmpv3 restricted-access
@@ -45,10 +47,10 @@ max-vlans 256
 vlan {{ id }}
    name "{{ vlan["name"]|capitalize }}"
    {%- if vlan["ports_tagged"] %}
-   tagged {{ vlan["ports_tagged"]|join(' ') }}
+   tagged {{ vlan["ports_tagged"]|join(',') }}
    {%- endif %}
    {%- if vlan["ports_untagged"] %}
-   untagged {{ vlan["ports_untagged"]|join(' ') }}
+   untagged {{ vlan["ports_untagged"]|join(',') }}
    {%- endif %}
    {%- if switch.subnet.0.vlan_id == id %}
    ip address {{ switch.ipv4 }} {{ switch.subnet.0.netmask }}
@@ -86,7 +88,7 @@ ipv6 authorized-managers {{ switch.subnet6.network }} {{ switch.subnet6.netmask
 ;--- Protection contre les boucles ---
 loop-protect disable-timer 30
 loop-protect transmit-interval 3
-loop-protect {{ additionals.loop_protected|join(' ') }}
+loop-protect {{ additionals.loop_protected|join(',') }}
 {%- endif %}
 ;--- Serveurs Radius 
 radius-server dead-time 2
@@ -126,7 +128,7 @@ dhcpv6-snooping
 {%- endif %}
 {%- if additionals.ra_guarded %}
 ;--- RA guards ---
-ipv6 ra-guard ports {{ additionals.ra_guarded|join(' ')}}
+ipv6 ra-guard ports {{ additionals.ra_guarded|join(',')}}
 {%- endif %}
 ;--- Config des prises ---
 {%- for port in switch.ports %}
@@ -153,7 +155,7 @@ interface {{ port.port }}
    {%- endif %}
    name "{{ port.pretty_name }}"
    {%- if port.get_port_profil.flow_control %}
-   flow control
+   flow-control
    {%- endif %}
    {%- if not port.get_port_profil.dhcp_snooping %}
    dhcp-snooping trust