re2o/switchs
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: re2o:Crans
Branches Tags
re2o:master
re2o:Crans
re2o:crans
...
pull from: re2o:master
Branches Tags
re2o:master
re2o:Crans
re2o:crans
Sign in to create a new pull request.

2 commits
Crans ... master

Author SHA1 Message Date
Gabriel Detraz
cd89d28a60 Fix re2o 2.8+ Compat 2020-08-04 23:28:10 +02:00
Gabriel Detraz
8defc92ecc Adapte à la nouvelle version de re2o 2020-05-23 01:57:33 +02:00
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main.py
View file

@ -76,10 +76,10 @@ class Switch:
#Trie les ip par vlan, et les ajoute ainsi que les subnet #Trie les ip par vlan, et les ajoute ainsi que les subnet
for ip, subnet in self.switch["interfaces_subnet"].items(): for ip, subnet in self.switch["interfaces_subnet"].items():
if not subnet[0]["vlan_id"] in vlans: if not subnet["vlan_id"] in vlans:
raise RuntimeError("La config est dangeureuse, le vlan d'administration n'est pas propagé au switch !") raise RuntimeError("La config est dangeureuse, le vlan d'administration n'est pas propagé au switch !")
vlans[subnet[0]["vlan_id"]].setdefault("ipv4", {}) vlans[subnet["vlan_id"]].setdefault("ipv4", {})
vlans[subnet[0]["vlan_id"]]["ipv4"][ip] = subnet vlans[subnet["vlan_id"]]["ipv4"][ip] = subnet
for ipv6, subnet in self.switch["interfaces6_subnet"].items(): for ipv6, subnet in self.switch["interfaces6_subnet"].items():
vlans[subnet["vlan_id"]].setdefault("ipv6", {}) vlans[subnet["vlan_id"]].setdefault("ipv6", {})
vlans[subnet["vlan_id"]]["ipv6"][ipv6] = subnet vlans[subnet["vlan_id"]]["ipv6"][ipv6] = subnet

6
templates/hp.tpl
View file

@ -57,7 +57,7 @@ vlan {{ id }}
{%- endif %} {%- endif %}
{%- if vlan.ipv4 %} {%- if vlan.ipv4 %}
{%- for ipv4, subnet in vlan.ipv4.items() %} {%- for ipv4, subnet in vlan.ipv4.items() %}
ip address {{ ipv4 }}/{{ subnet.0.netmask_cidr }} ip address {{ ipv4 }}/{{ subnet.netmask_cidr }}
{%- endfor %} {%- endfor %}
{%- else %} {%- else %}
no ip address no ip address
@ -95,7 +95,7 @@ aaa authentication ssh enable public-key none
ip ssh ip ssh
ip ssh filetransfer ip ssh filetransfer
{%- if settings.switchs_management_utils.subnet %} {%- if settings.switchs_management_utils.subnet %}
ip authorized-managers {{ settings.switchs_management_utils.subnet.0.network }} {{ settings.switchs_management_utils.subnet.0.netmask }} access manager ip authorized-managers {{ settings.switchs_management_utils.subnet.network }} {{ settings.switchs_management_utils.subnet.netmask }} access manager
{%- endif %} {%- endif %}
{%- for ipv4 in settings.switchs_management_utils.dns_recursive_servers.ipv4 %} {%- for ipv4 in settings.switchs_management_utils.dns_recursive_servers.ipv4 %}
ip dns server-address priority {{ loop.index }} {{ ipv4 }} ip dns server-address priority {{ loop.index }} {{ ipv4 }}
@ -111,7 +111,7 @@ loop-protect {{ additionals.loop_protected|join(',') }}
{%- endif %} {%- endif %}
;--- Serveurs Radius ;--- Serveurs Radius
radius-server dead-time 2 radius-server dead-time 2
{%- for ipv4 in settings.switchs_management_utils.radius_servers.ipv4 %} {%- for ipv4 in switch.get_radius_servers.ipv4 %}
radius-server host {{ ipv4 }} key "{{ switch.get_radius_key_value }}" radius-server host {{ ipv4 }} key "{{ switch.get_radius_key_value }}"
radius-server host {{ ipv4 }} dyn-authorization radius-server host {{ ipv4 }} dyn-authorization
{%- endfor %} {%- endfor %}