Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 3bfdfb23 authored by Nicolas Perrin's avatar Nicolas Perrin
Browse files

[lib] Remove kavlan-topo management

parent 2bff8862
No related branches found
No related tags found
No related merge requests found
Pipeline #1067861 passed with warnings
...@@ -39,13 +39,6 @@ ...@@ -39,13 +39,6 @@
<% <%
end end
if site_refapi['kavlans'].has_key?('topo')
Range.new(*site_refapi['kavlans']['topo'].split("..").map{|d| Integer(d)}).each do |kavlan_topo_id| -%>
{"value": <%= kavlan_topo_id %>, "name": "KAVLAN-<%= kavlan_topo_id %>", "type": "kavlan-topo"},
<%
end
end
if site_refapi.has_key?('kavlan_nef') -%> if site_refapi.has_key?('kavlan_nef') -%>
{"value": <%= site_refapi['kavlan_nef'] %>, "name": "NEF", "type": "NULL"}, {"value": <%= site_refapi['kavlan_nef'] %>, "name": "NEF", "type": "NULL"},
<% <%
......
...@@ -74,11 +74,6 @@ def generate_reference_api ...@@ -74,11 +74,6 @@ def generate_reference_api
site["type"] = "site" site["type"] = "site"
site["uid"] = site_uid site["uid"] = site_uid
#Move special entry "kavlan_topo"
if site["kavlan_topo"]
site["kavlans"]["topo"] = site.delete("kavlan_topo")
end
site_path = Pathname.new(refapi_path).join("sites", site_uid) site_path = Pathname.new(refapi_path).join("sites", site_uid)
site_path.mkpath() site_path.mkpath()
......
...@@ -66,7 +66,6 @@ kavlans: ...@@ -66,7 +66,6 @@ kavlans:
network_ipv6: ipv6_network network_ipv6: ipv6_network
gateway_ipv6: optional_ipv6_address gateway_ipv6: optional_ipv6_address
kavlan_ip_range: ipv4_network kavlan_ip_range: ipv4_network
kavlan_topo: optional_string
kavlan_nef: optional_integer kavlan_nef: optional_integer
pdus: pdus:
<optional_hash>: <optional_hash>:
...@@ -86,4 +85,4 @@ frontend_ip: ipv4_address ...@@ -86,4 +85,4 @@ frontend_ip: ipv4_address
ipv6: ipv6:
prefix: ipv6_network prefix: ipv6_network
site_global_kavlan: integer site_global_kavlan: integer
site_index: integer site_index: integer
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment