Fix MR AP rooms because of THE bug #712

Open

mdebray wants to merge 6 commits from fix_mr_ap into main

pull from: fix_mr_ap

merge into: DGNum:main

DGNum:main

DGNum:native-vlan-id

DGNum:lon/wp4nix

DGNum:lon/nixos-unstable

DGNum:lon/nixos-25.11

DGNum:lon/nixos-25.05

DGNum:lon/nix-zulip

DGNum:lon/lon

DGNum:lon/lix-module

DGNum:lon/lix-diff

DGNum:lon/lix

DGNum:lon/liminix

DGNum:lon/git-hooks

DGNum:lon/dns.nix

DGNum:lon/dgsi

DGNum:lon/colmena

DGNum:lon/agenix

DGNum:reaction_php

DGNum:victoria_security

DGNum:prod-dns

DGNum:move_netbird

DGNum:external_upgrade

DGNum:nixos-25.11

DGNum:ulogd_socket_buffer_maxsize

DGNum:takumiv2

DGNum:init_2511_pin

DGNum:automatic-updates

DGNum:dns

DGNum:disable_geo_bk

DGNum:hypervisor-incus

DGNum:external01

DGNum:zulip

DGNum:pkg-update

DGNum:test-Jaccess01

DGNum:testing/switch-test

DGNum:geo01-no-notify

DGNum:alert-manager-notify

DGNum:deploy_jdl

DGNum:jdl01

DGNum:feat/ap-prod

DGNum:drbd

DGNum:mdebray/ap-dev

DGNum:zulip_11_x

DGNum:labrouter-wg

DGNum:zulipmail

DGNum:feature/add-bmc-ips

DGNum:ecoppens/zulip-dns

DGNum:build01-journald

DGNum:mdebray/nixos-25.05

DGNum:declarative-buckets

DGNum:vault01-isp

DGNum:demarches01

DGNum:hackdays-ap

DGNum:raito/zulip

DGNum:staging-cas

DGNum:feature/hackdays01

DGNum:testing02

DGNum:openwrt-exporter

DGNum:ban_git_scrappers

DGNum:ap-poc-v01

DGNum:hypervisor

DGNum:victoria-metrics

DGNum:init-dgnum-page

DGNum:takumi-can-do-ollama

Conversation 2 Commits 6 Files changed 4 +813 -834

mdebray commented 2026-01-06 15:08:25 +01:00

Owner

Copy link

No description provided.

mdebray added 1 commit 2026-01-06 15:08:26 +01:00

chore(meta/isp): Revamp room vlan generation b3ff49e4a9

mdebray commented 2026-01-06 15:09:52 +01:00

Author

Owner

Copy link

Lepremier commit est un refactor sans impact sur les drv:

infra4/meta/isp on  HEAD (68838c8) [$]
❯ colmena eval -E '{nodes, ...}: (builtins.toJSON nodes.vault01._module.specialArgs.meta.isp.vlans)' | jq -r | jq -S > vlans_before.json
[INFO ] Using configuration: /home/maurice/ghq/git.dgnum.eu/DGNum/infra4/hive.nix

infra4/meta/isp on  HEAD (68838c8) [$?] took 3s
❯ git switch -
Previous HEAD position was 68838c8d chore(dgnum.eu): update MX record
Switched to branch 'fix_mr_ap'
Your branch is up to date with 'origin/fix_mr_ap'.

infra4/meta/isp on  fix_mr_ap [$?]
❯ colmena eval -E '{nodes, ...}: (builtins.toJSON nodes.vault01._module.specialArgs.meta.isp.vlans)' | jq -r | jq -S > vlans_after.json
[INFO ] Using configuration: /home/maurice/ghq/git.dgnum.eu/DGNum/infra4/hive.nix

infra4/meta/isp on  fix_mr_ap [$?] took 3s
❯ diff -u vlans_*

Lepremier commit est un refactor sans impact sur les drv: ``` infra4/meta/isp on  HEAD (68838c8) [$] ❯ colmena eval -E '{nodes, ...}: (builtins.toJSON nodes.vault01._module.specialArgs.meta.isp.vlans)' | jq -r | jq -S > vlans_before.json [INFO ] Using configuration: /home/maurice/ghq/git.dgnum.eu/DGNum/infra4/hive.nix infra4/meta/isp on  HEAD (68838c8) [$?] took 3s ❯ git switch - Previous HEAD position was 68838c8d chore(dgnum.eu): update MX record Switched to branch 'fix_mr_ap' Your branch is up to date with 'origin/fix_mr_ap'. infra4/meta/isp on  fix_mr_ap [$?] ❯ colmena eval -E '{nodes, ...}: (builtins.toJSON nodes.vault01._module.specialArgs.meta.isp.vlans)' | jq -r | jq -S > vlans_after.json [INFO ] Using configuration: /home/maurice/ghq/git.dgnum.eu/DGNum/infra4/hive.nix infra4/meta/isp on  fix_mr_ap [$?] took 3s ❯ diff -u vlans_* ```

mdebray force-pushed fix_mr_ap from b3ff49e4a9 to 6ac9067c2d 2026-01-06 15:11:56 +01:00 Compare

mdebray added 1 commit 2026-01-06 15:39:25 +01:00

fix(isp): Change AP room status ... c90f4d4775

MB310
MB705
MB416
MC705

mdebray force-pushed fix_mr_ap from c90f4d4775 to a575b6fde4 2026-01-06 16:12:57 +01:00 Compare

mdebray commented 2026-01-06 16:14:04 +01:00

Author

Owner

Copy link

@mdebray wrote in #712 (comment):

Lepremier commit est un refactor sans impact sur les drv:

Bon cette afirmation était fausse mais mnt elle est vraie

@mdebray wrote in https://git.dgnum.eu/DGNum/infrastructure/pulls/712#issuecomment-20345: > Lepremier commit est un refactor sans impact sur les drv: Bon cette afirmation était fausse mais mnt elle est vraie

😆 1

mdebray force-pushed fix_mr_ap from a575b6fde4 to 733c01eb4e 2026-01-06 16:16:52 +01:00 Compare

mdebray changed title from chore(meta/isp): Revamp room vlan generation to Fix MR AP rooms because of THE bug 2026-01-06 16:27:17 +01:00

mdebray added the

deployed

label 2026-01-07 09:12:05 +01:00

mdebray added 1 commit 2026-01-07 10:12:45 +01:00

fix(isp): Change AP room status ... 991910648f

MB105

mdebray added 2 commits 2026-01-10 04:38:04 +01:00

feat(isp): Repurpose all mr APs f12e1e51bb

feat(isp/switches): Prepare ztp 111c261c98

mdebray force-pushed fix_mr_ap from 111c261c98 to 9ee613c878 2026-01-10 04:49:23 +01:00 Compare

mdebray force-pushed fix_mr_ap from 9ee613c878 to 2381590fc8 2026-01-10 05:36:27 +01:00 Compare

mdebray force-pushed fix_mr_ap from 2381590fc8 to d2da7c393f 2026-01-10 10:30:05 +01:00 Compare

mdebray force-pushed fix_mr_ap from d2da7c393f to d9b5b1aea7 2026-01-10 11:56:09 +01:00 Compare

mdebray force-pushed fix_mr_ap from d9b5b1aea7 to f0d28372d3 2026-01-10 12:04:54 +01:00 Compare

mdebray force-pushed fix_mr_ap from f0d28372d3 to ef64ea32be 2026-01-10 12:06:03 +01:00 Compare

ecoppens force-pushed fix_mr_ap from ef64ea32be to 5d05c8ce63 2026-01-10 16:11:46 +01:00 Compare

All checks were successful

Hide all checks

Check meta / check_dns (pull_request) Successful in 18s

Required

Details

Check meta / check_meta (pull_request) Successful in 20s

Required

Details

Check workflows / check_workflows (pull_request) Successful in 21s

Required

Details

Run pre-commit on all files / pre-commit (push) Successful in 30s

Required

Details

Build all the nodes / optic-loop (pull_request) Successful in 28s

Required

Details

Build all the nodes / sw-Jourdan (pull_request) Successful in 29s

Required

Details

Build all the nodes / sw-Montrouge (pull_request) Successful in 32s

Required

Details

Build all the nodes / sw-Pantheon (pull_request) Successful in 33s

Required

Details

Build all the nodes / ap01 (pull_request) Successful in 39s

Required

Details

Build all the nodes / bridge01 (pull_request) Successful in 44s

Required

Details

Build all the nodes / build01 (pull_request) Successful in 45s

Required

Details

Build all the nodes / geo01 (pull_request) Successful in 46s

Required

Details

Build all the nodes / geo02 (pull_request) Successful in 47s

Required

Details

Build all the nodes / lab-router01 (pull_request) Successful in 46s

Required

Details

Build all the nodes / cof02 (pull_request) Successful in 49s

Required

Details

Build all the nodes / tower01 (pull_request) Successful in 47s

Required

Details

Build all the nodes / external01 (pull_request) Successful in 50s

Required

Details

Build all the nodes / storage01 (pull_request) Successful in 50s

Required

Details

Show derivation diffs / ap01 (pull_request) Successful in 51s

Details

Build all the nodes / hypervisors1 (pull_request) Successful in 55s

Required

Details

Build all the nodes / hypervisors0 (pull_request) Successful in 59s

Required

Details

Build all the nodes / iso (pull_request) Successful in 58s

Required

Details

Build the shell / build-shell (pull_request) Successful in 28s

Required

Details

Show derivation diffs / bridge01 (pull_request) Successful in 1m4s

Details

Build all the nodes / compute01 (pull_request) Successful in 1m4s

Required

Details

Show derivation diffs / build01 (pull_request) Successful in 1m6s

Details

Show derivation diffs / geo01 (pull_request) Successful in 1m5s

Details

Show derivation diffs / cof02 (pull_request) Successful in 1m9s

Details

Build all the nodes / web02 (pull_request) Successful in 47s

Required

Details

Build all the nodes / rescue01 (pull_request) Successful in 1m16s

Required

Details

Show derivation diffs / external01 (pull_request) Successful in 1m15s

Details

Build all the nodes / krz01 (pull_request) Successful in 1m16s

Required

Details

Show derivation diffs / optic-loop (pull_request) Successful in 29s

Details

Show derivation diffs / sw-Jourdan (pull_request) Successful in 29s

Details

Show derivation diffs / sw-Montrouge (pull_request) Successful in 30s

Details

Build all the nodes / web03 (pull_request) Successful in 51s

Required

Details

Show derivation diffs / sw-Pantheon (pull_request) Successful in 34s

Details

Build all the nodes / web01 (pull_request) Successful in 1m3s

Required

Details

Show derivation diffs / geo02 (pull_request) Successful in 56s

Details

Show derivation diffs / compute01 (pull_request) Successful in 1m38s

Details

Run pre-commit on all files / pre-commit (pull_request) Successful in 35s

Required

Details

Show derivation diffs / lab-router01 (pull_request) Successful in 56s

Details

Show derivation diffs / hypervisors0 (pull_request) Successful in 1m9s

Details

Show derivation diffs / storage01 (pull_request) Successful in 58s

Details

Show derivation diffs / tower01 (pull_request) Successful in 56s

Details

Show derivation diffs / hypervisors1 (pull_request) Successful in 1m10s

Details

Show derivation diffs / iso (pull_request) Successful in 1m13s

Details

Build all the nodes / vault01 (pull_request) Successful in 1m41s

Required

Details

Show derivation diffs / web02 (pull_request) Successful in 56s

Details

Build all the nodes / vault03 (pull_request) Successful in 1m42s

Required

Details

Build all the nodes / vault02 (pull_request) Successful in 1m44s

Required

Details

Show derivation diffs / web03 (pull_request) Successful in 1m6s

Details

Show derivation diffs / krz01 (pull_request) Successful in 1m38s

Details

Show derivation diffs / rescue01 (pull_request) Successful in 1m36s

Details

Show derivation diffs / web01 (pull_request) Successful in 1m32s

Details

Show derivation diffs / vault01 (pull_request) Successful in 2m4s

Details

Show derivation diffs / vault03 (pull_request) Successful in 2m10s

Details

Show derivation diffs / vault02 (pull_request) Successful in 2m25s

Details

This pull request is blocked because it's outdated.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin fix_mr_ap:fix_mr_ap

git switch fix_mr_ap

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

awaiting

awaiting-author

Awaiting for the author interaction (e.g. QA/confirmation/final merge)

  

awaiting

awaiting-reviewer

Awaiting for a privileged reviewer to approve this PR

  

bot

Pull Request opened by a bot

  

deployed

This PR is currently deployed on the infra

  

Silenced alert

This is a known and silenced alert.

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

awaiting

awaiting-author

awaiting

awaiting-reviewer

bot

deployed

Silenced alert

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

DGNum/infrastructure!712

No description provided.