This commit is contained in:
forgejo-actions 2026-10-13 11:33:08 +00:00
commit fc49f8aca7
8 changed files with 91 additions and 39 deletions

View file

@ -432,18 +432,27 @@ et <code class="docutils literal notranslate"><span class="pre">evpn-3hv.yml</sp
<span class="nt">segments</span><span class="p">:</span>
<span class="w"> </span><span class="nt">underlay</span><span class="p">:</span>
<span class="w"> </span><span class="nt">switch</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">sw1</span>
<span class="w"> </span><span class="nt">routers</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">sw1</span><span class="p p-Indicator">,</span><span class="w"> </span><span class="nv">sw2</span><span class="p p-Indicator">]</span>
<span class="w"> </span><span class="nt">cidr</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">192.168.14.0/24</span>
<span class="w"> </span><span class="nt">mtu</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">9000</span>
<span class="nt">nodes</span><span class="p">:</span>
<span class="w"> </span><span class="nt">sw1</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">switch</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">2</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">1024</span><span class="p p-Indicator">,</span>
<span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.1/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/sw1.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">router</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">2</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">1024</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.2</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.1/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span>
<span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/sw1.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">sw2</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">router</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">2</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">1024</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.3</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.2/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span>
<span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/sw2.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">rr1</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">rr</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">1</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">1024</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.2</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.3/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.4</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.3/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span>
<span class="nt"> loopback</span><span class="p">:</span><span class="w"> </span><span class="nv">10.255.255.1/32</span><span class="p p-Indicator">,</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/rr1.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">rr2</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">rr</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">1</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">1024</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.5</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> secondary</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">169.254.0.4/28</span><span class="p p-Indicator">]</span><span class="w"> </span><span class="p p-Indicator">},</span>
<span class="nt"> loopback</span><span class="p">:</span><span class="w"> </span><span class="nv">10.255.255.2/32</span><span class="p p-Indicator">,</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/rr2.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">hv1</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">host</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">4</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">16384</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.11</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/hv1.conf</span><span class="p p-Indicator">,</span><span class="nt"> provision</span><span class="p">:</span><span class="w"> </span><span class="nv">provision/hypervisor.sh</span><span class="p p-Indicator">,</span>
@ -459,10 +468,13 @@ et <code class="docutils literal notranslate"><span class="pre">evpn-3hv.yml</sp
<p>Les ASN, la loopback du route reflector, le lien <code class="docutils literal notranslate"><span class="pre">169.254.0.0/28</span></code> et le subnet des hyperviseurs
de l’exemple sont <strong>ceux de la production</strong> (décision du 2026-10-04, #50) : les fichiers de
<code class="docutils literal notranslate"><span class="pre">test/e2e/topologies/</span></code> restent ainsi au plus près de ce qui tourne réellement. Toutes les adresses y sont
<strong>fixées</strong> par <code class="docutils literal notranslate"><span class="pre">addresses</span></code> — le route reflector en <code class="docutils literal notranslate"><span class="pre">.2</span></code>, les hyperviseurs à partir de <code class="docutils literal notranslate"><span class="pre">.11</span></code> —
pour que le modèle se lise sans le plan et ne dépende pas de l’ordre de déclaration : le
<code class="docutils literal notranslate"><span class="pre">frr.conf</span></code> d’un hyperviseur, écrit à la main, porte son adresse en <code class="docutils literal notranslate"><span class="pre">router-id</span></code>. Seul le switch
n’en déclare pas : il porte toujours la passerelle, la première adresse du segment.</p>
<strong>fixées</strong> par <code class="docutils literal notranslate"><span class="pre">addresses</span></code> — les switchs en <code class="docutils literal notranslate"><span class="pre">.2</span></code> et <code class="docutils literal notranslate"><span class="pre">.3</span></code>, les route reflectors en <code class="docutils literal notranslate"><span class="pre">.4</span></code> et <code class="docutils literal notranslate"><span class="pre">.5</span></code>,
les hyperviseurs à partir de <code class="docutils literal notranslate"><span class="pre">.11</span></code> — pour que le modèle se lise sans le plan et ne dépende pas
de l’ordre de déclaration : le <code class="docutils literal notranslate"><span class="pre">frr.conf</span></code> d’un hyperviseur, écrit à la main, porte son adresse en
<code class="docutils literal notranslate"><span class="pre">router-id</span></code>. Les deux switchs <code class="docutils literal notranslate"><span class="pre">sw1</span></code> et <code class="docutils literal notranslate"><span class="pre">sw2</span></code> sont les routeurs du segment (rôle <code class="docutils literal notranslate"><span class="pre">router</span></code> de
labctl) : la passerelle, la première adresse du segment, est portée en VRRP v3 par celui qui est
maître, sans préemption — voir la section du guide de labctl sur les routeurs. Leurs
<code class="docutils literal notranslate"><span class="pre">frr.conf</span></code> ne diffèrent que par <code class="docutils literal notranslate"><span class="pre">hostname</span></code> et <code class="docutils literal notranslate"><span class="pre">router-id</span></code> ; labctl y ajoute la strophe VRRP.</p>
<section id="roles">
<h3>Rôles<a class="headerlink" href="#roles" title="Lien vers cette rubrique">#</a></h3>
<p>Les configurations FRR du lab vivent dans <code class="docutils literal notranslate"><span class="pre">test/e2e/topologies/frr/</span></code>, une par nœud, <strong>écrites à la main</strong> :
@ -531,7 +543,7 @@ script par celui de <code class="docutils literal notranslate"><span class="pre"
que <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code> y lit l’adresse et la passerelle qu’il déplace sur <code class="docutils literal notranslate"><span class="pre">br-000000</span></code>. <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code>
télécharge la release sur <code class="docutils literal notranslate"><span class="pre">git.g3e.fr</span></code> sans réessayer : le script attend d’abord que le serveur
réponde, à travers le switch. Les deux fichiers <code class="docutils literal notranslate"><span class="pre">agent/</span></code> donnent à l’agent la section <code class="docutils literal notranslate"><span class="pre">bgp</span></code>
(AS 64600, route reflector <code class="docutils literal notranslate"><span class="pre">10.255.255.1</span></code>) et un watchdog toutes les 10 s ;
(AS 64600, route reflectors <code class="docutils literal notranslate"><span class="pre">10.255.255.1</span></code> et <code class="docutils literal notranslate"><span class="pre">10.255.255.2</span></code>) et un watchdog toutes les 10 s ;
<code class="docutils literal notranslate"><span class="pre">agent/two.yml</span></code> met en plus hv1 sur le serveur DHCP intégré (<code class="docutils literal notranslate"><span class="pre">dhcp.backend:</span> <span class="pre">two</span></code>),
<code class="docutils literal notranslate"><span class="pre">agent/bgp.yml</span></code> laisse les autres sur dnsmasq.</p>
<p><strong>Tester l’arbre courant plutôt que la release.</strong> <code class="docutils literal notranslate"><span class="pre">test/e2e/build.sh</span></code> compile <code class="docutils literal notranslate"><span class="pre">agent</span></code>,
@ -614,9 +626,9 @@ passent</p></td>
</div>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p><strong>Le switch du lab est un routeur Linux avec FRR, par choix.</strong> Il joue le rôle générique de
routeur de cluster : passerelle des hyperviseurs, session eBGP avec BFD vers le route reflector,
dont il n’accepte que la loopback (<code class="docutils literal notranslate"><span class="pre">test/e2e/topologies/frr/sw1.conf</span></code>). L’équipement réel dépend de qui
<p><strong>Les switchs du lab sont des routeurs Linux avec FRR, par choix.</strong> Ils jouent le rôle générique
de routeur de cluster : passerelle des hyperviseurs, sessions eBGP avec BFD vers les route
reflectors, dont ils n’acceptent que les loopbacks (<code class="docutils literal notranslate"><span class="pre">test/e2e/topologies/frr/sw1.conf</span></code>). L’équipement réel dépend de qui
déploie l’infrastructure (MikroTik aujourd’hui ; Cisco, Juniper, Arista… demain) : il n’a besoin
que de BGP et d’EVPN, et sa configuration propre au constructeur n’a pas sa place dans le lab.</p>
</div>
@ -675,10 +687,12 @@ VPC sur l’autre hyperviseur (témoin) et pas celle de l’autre VPC — aucune
<td><p>hv1, hv2</p></td>
</tr>
<tr class="row-odd"><td><p><code class="docutils literal notranslate"><span class="pre">s6-rr-loss</span></code></p></td>
<td><p>FRR arrêté sur le route reflector, ping continu entre les VM de <code class="docutils literal notranslate"><span class="pre">s4</span></code> : la session tombe,
le trafic restant est <strong>mesuré</strong> (<code class="docutils literal notranslate"><span class="pre">INFO</span></code>) à 30 et 90 s ; au retour du route reflector, le
VTEP distant est réappris et le trafic repasse — délai mesuré</p></td>
<td><p>hv1, hv2, rr1</p></td>
<td><p>FRR arrêté sur rr1, puis sur rr2, ping continu entre les VM
de <code class="docutils literal notranslate"><span class="pre">s4</span></code> : la session vers le route reflector arrêté tombe, celle vers l’autre reste
établie, le VTEP distant reste connu et <strong>le trafic continue</strong> (au moins 45 réponses sur 50
à 30 s) ; session rétablie au redémarrage, délai mesuré ; au plus 1 % de pertes sur tout le
scénario (#54)</p></td>
<td><p>hv1, hv2, rr1, rr2</p></td>
</tr>
<tr class="row-even"><td><p><code class="docutils literal notranslate"><span class="pre">s7-l3vni</span></code></p></td>
<td><p>qualification de <a class="reference external" href="https://git.g3e.fr/syonad/two/issues/41">#41</a> <strong>par l’API</strong> : VPC créées
@ -707,6 +721,15 @@ non, même hôte ou non) ; chaque VM voit la MAC de gateway de son propre hôte
double sur les quatre VNI</p></td>
<td><p>hv2, hv3, rr1</p></td>
</tr>
<tr class="row-odd"><td><p><code class="docutils literal notranslate"><span class="pre">s10-switch-loss</span></code></p></td>
<td><p>un seul switch maître VRRP de la passerelle (lu par <code class="docutils literal notranslate"><span class="pre">show</span> <span class="pre">vrrp</span></code>, pas supposé) ; interface
<code class="docutils literal notranslate"><span class="pre">underlay</span></code> du maître coupée pendant un ping continu de hv1 vers la loopback de rr1 :
l’autre switch devient maître, les sessions EVPN de hv1 <strong>ne tombent pas</strong> (compteur
<code class="docutils literal notranslate"><span class="pre">dropped</span></code> inchangé), le trafic reprend (au moins 45 réponses sur 50 à 20 s), plus long
silence sous 5 s ; interface rétablie : ses sessions eBGP reviennent et il <strong>reste en
attente</strong>, sans reprendre la passerelle (#54)</p></td>
<td><p>hv1, sw1, sw2</p></td>
</tr>
</tbody>
</table>
</div>
@ -809,6 +832,14 @@ n’est <strong>pas forcément un aléa du lab</strong> : c’est la signature d
comme test instable ni ajouter un nouvel essai qui le masquerait ; regarder d’abord le cache ARP
de la VM (<code class="docutils literal notranslate"><span class="pre">ip</span> <span class="pre">neigh</span> <span class="pre">show</span> <span class="pre">&lt;gateway&gt;</span></code>) et l’état de la session côté VM.</p>
</div>
<p>Le 2026-10-13, labctl <code class="docutils literal notranslate"><span class="pre">0.2.0</span></code>, release <code class="docutils literal notranslate"><span class="pre">0.2.0rc008</span></code> et binaires de l’arbre courant,
<code class="docutils literal notranslate"><span class="pre">evpn-3hv.yml</span></code> avec deux switchs et deux route reflectors (#54) : <code class="docutils literal notranslate"><span class="pre">s1</span></code> à <code class="docutils literal notranslate"><span class="pre">s10</span></code> <strong>313
réussi(s), 0 échoué(s)</strong> ; lab monté en 8 min. Segments sur un bridge de l’hôte, sept taps ;
<code class="docutils literal notranslate"><span class="pre">sw2</span></code> maître VRRP au démarrage, <code class="docutils literal notranslate"><span class="pre">sw1</span></code> en attente avec sa passerelle coupée. <code class="docutils literal notranslate"><span class="pre">s6</span></code> : 0
requête perdue sur 510 pendant l’arrêt de rr1 puis de rr2, session rétablie 14 s après le
redémarrage de FRR. <code class="docutils literal notranslate"><span class="pre">s10</span></code> : <code class="docutils literal notranslate"><span class="pre">sw2</span></code> coupé, <code class="docutils literal notranslate"><span class="pre">sw1</span></code> maître, 14 requêtes perdues, plus long
silence 2,8 s, sessions EVPN de hv1 jamais coupées ; <code class="docutils literal notranslate"><span class="pre">sw2</span></code> rétabli reste en attente.
<code class="docutils literal notranslate"><span class="pre">s9</span></code> sans <code class="docutils literal notranslate"><span class="pre">Broken</span> <span class="pre">pipe</span></code> cette fois : #57 n’est pas corrigé pour autant.</p>
<p>Les VM sont accessibles depuis le netns de leur VPC, sur l’hyperviseur, avec l’utilisateur
<code class="docutils literal notranslate"><span class="pre">syonad</span></code> créé par les métadonnées de two :</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>test/e2e/labctl.sh ssh "./labctl ssh hv1 'sudo ip netns exec vp-s4 ssh -i /root/.ssh/lab-vm syonad@10.240.1.10'"