From c1bcd2343ec5f0a85200c5ce5ddcf7127159066f Mon Sep 17 00:00:00 2001
From: Matthieu Imbert <matthieu.imbert@inria.fr>
Date: Wed, 22 Apr 2020 09:42:24 +0200
Subject: [PATCH] [ipv6] use global config instead of hardcoded value
---
input/grid5000/ipv6.yaml | 1 +
lib/refrepo/input_loader.rb | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/input/grid5000/ipv6.yaml b/input/grid5000/ipv6.yaml
index 913b62eab9..610223ec06 100644
--- a/input/grid5000/ipv6.yaml
+++ b/input/grid5000/ipv6.yaml
@@ -1,5 +1,6 @@
---
ipv6:
+ prefix: '2001:660:4406'
site-indexes:
grenoble: 1
lille: 2
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 6616d8f1db..4da43d7615 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -162,7 +162,7 @@ def add_ipv6(h)
ip4 = ipv6_adapters.values[0]['ip']
ipv6_adapters.each_with_index do |(_iface, nah), idx|
# compute and assign IPv6 based on IPv4 of the first adapter
- ip6 = '2001:660:4406:'
+ ip6 = h['ipv6']['prefix'] + ':'
ip6 += '%x' % h['ipv6']['site-indexes'][site_uid]
ip6 += '00:'
ip6 += '%x' % ((ip4.split('.')[2].to_i & 0b1111) + 1)
@@ -199,7 +199,7 @@ def add_kavlan_ipv6s(h)
hn['kavlan6'][iface] = {}
hn['kavlan'][iface].each_key do |kvl|
kvl_id = kvl.split('-')[1].to_i
- ip6 = '2001:660:4406:'
+ ip6 = h['ipv6']['prefix'] + ':'
ip6 += '%x' % h['ipv6']['site-indexes'][site_uid]
ip6 += '%x:' % (kvl_id + 0x80)
ip6 += '%x' % ((ip4.split('.')[2].to_i & 0b1111) + 1)
--
GitLab