diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index ffa6db26d8e6de341879c3dc078e77cf526f7486..3c19b90fa12311cfd152ec87f3c05a1eddb7f718 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -544,6 +544,7 @@
       "snmp_pattern": "ethernet1/1/%PORT%:1"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index a19820e0487e3f9141016fdbbe3c1b974fa0e7b6..fd668ce9e08a0fafcb97b73aa97134c2ce2647ee 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -269,6 +269,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 2e54c4219baece3631e8a66afaafbb2e74992851..a4f25753b7075202767eac163516803aaee18b7a 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -173,6 +173,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index 415af3c10dcd2acf8b882dc2821774d0771fb0f9..b517205cc68680839483f160b88c0b54398888a8 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -141,6 +141,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
index 4307cd4d54ad5a151fae9a3efa0cc47c800ca6a2..1a6a9a2b674b6dfbe686d0ec7c397b22b8e9ece0 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -287,6 +287,7 @@
       "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
index beb42389669c6c4c5d6b0ecec9c03b5700cbda8d..2bf7789906d174984e6fd1d44d0eaeb985b46a41 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -157,6 +157,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
index 3e22457f5b21909532d949bd87650eeb88a9fbb7..daa0c0f86dacff1d1d916a55f4ccf4f328c56b33 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -157,6 +157,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index a007705cad34df3e57cf45045bc0e0f66d0c5296..2f804efc7980affde119689df497cc46708a7695 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -158,6 +158,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index c830661e37ed7caec20bdd9fef56f9c77213e022..1b5db4c71408ba3d2bbd74a8be85e874f0d622ed 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -311,6 +311,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json
index 086c22fa6384888cab45b7603cd7753afafc2bdf..40977b74aa3611bfb5d34bbddab137a45a3cc3b4 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -177,6 +177,7 @@
       "snmp_pattern": "ethernet1/%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 3aedd448e471435a7e3722f24ba84659d8fec5ac..416327cef8899798884454d419555946beba7dbb 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -128,6 +128,7 @@
       "snmp_pattern": "GigabitEthernet%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/lyon/network_equipments/sneowise.json b/data/grid5000/sites/lyon/network_equipments/sneowise.json
index db8a192fb0e975e9b77c9446512126cef040bd4d..0d9559d080b9f9a014ee9645da3d19e1fa22f6d2 100644
--- a/data/grid5000/sites/lyon/network_equipments/sneowise.json
+++ b/data/grid5000/sites/lyon/network_equipments/sneowise.json
@@ -155,6 +155,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
 
   ],
diff --git a/data/grid5000/sites/lyon/network_equipments/sneowiseib1.json b/data/grid5000/sites/lyon/network_equipments/sneowiseib1.json
index 9626f31a753b27a822ff1866a0565a0d4f5f8275..457ca492b253f26e7f03e21f1ed7c5f1e2ff133f 100644
--- a/data/grid5000/sites/lyon/network_equipments/sneowiseib1.json
+++ b/data/grid5000/sites/lyon/network_equipments/sneowiseib1.json
@@ -136,6 +136,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
 
   ],
diff --git a/data/grid5000/sites/lyon/network_equipments/sneowiseib2.json b/data/grid5000/sites/lyon/network_equipments/sneowiseib2.json
index 82d46cb0dc136e23aa05d07a01c8fe0134d386d7..5f78031e8eb23e400fe658e7344e63a2f66aa818 100644
--- a/data/grid5000/sites/lyon/network_equipments/sneowiseib2.json
+++ b/data/grid5000/sites/lyon/network_equipments/sneowiseib2.json
@@ -136,6 +136,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
 
   ],
diff --git a/data/grid5000/sites/lyon/network_equipments/swib.json b/data/grid5000/sites/lyon/network_equipments/swib.json
index 58b9b505fa9418982ce04c864cb152b3b2d0a5ab..574227cc6a883cd7e366ecbdedbee4bf015ebf79 100644
--- a/data/grid5000/sites/lyon/network_equipments/swib.json
+++ b/data/grid5000/sites/lyon/network_equipments/swib.json
@@ -79,6 +79,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
 
   ],
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index 8989538e4c7c8fd2edaa0e827eface126b900ad3..e29249a78b105e56fec28be1e01a725c9ebd7b0d 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -1985,6 +1985,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
index 83ea86e40960051a80e7febdf62e4439473b8778..17ad3f0f7f5c09f38fc81af31a973312ff5efc67 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -36,6 +36,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "model": "Infiniband",
   "pdu": [
     {
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 6aa7eb841941e62e7acc829d6cbc56c05e779cd0..df6434fad4e54c2362a2cb4e5254486400cb3500 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -156,6 +156,7 @@
       "snmp_pattern": "ethernet1/%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
index 46602ab51e0ed95ff85a3338aa2111997e46dc08..c373bb623f81558d2825c56fb276ab68a7ec33d1 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
@@ -289,6 +289,7 @@
       "snmp_pattern": "TenGigabitEthernet1/0/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
index 5635c5f136b0e1abc65052da74dd02064b8d91b1..0de95bca5a94ee83a3bbe16da8559f8b760623da 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
@@ -14,6 +14,7 @@
       "snmp_pattern": "%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "model": "Omni-Path",
   "pdu": [
     {
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
index e8614c0a6fe7a4cec61bfd42b20c8c01a7ec7c13..927b563ffb87da852ee2fe0602be18dfd54210b4 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -413,6 +413,7 @@
       "snmp_pattern": "TenGigabitEthernet 1/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index 6e60d9e97816a8618951e6899077f96c2c334adf..486276eaa2bebbfa6de9a293939f48d03c006c3c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -1149,6 +1149,7 @@
       "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 530b9c3e978ec8744fcc9e9036ef229a60048bee..99c025b7cfebdd821c79ee7572c02355503599b2 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1149,6 +1149,7 @@
       "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index 4fc17d704f574f513dd6c2657b9ac2e33eaedd3e..050b73de9f11953426713d5a689ba5a92aaff7c7 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -104,6 +104,7 @@
       "snmp_pattern": "ethernet1/%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 18ed02bafe629fc9267b4cb81a7334eabdf99e31..15979d795155166b5def9d70e9e40512a76200ae 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -582,6 +582,7 @@
       "snmp_pattern": "TenGigabitEthernet 1/%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
index 37014f107c330a95d82194a0dd3721f2b3bb09ed..ec487648cc832cfaa6febc735193af9656c99125 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
@@ -324,6 +324,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
index 20ee71dc49fe06e00378fc23582c08a92feaa3ae..f2983243a0e425a1d22cae8bcdde9ff896b96239 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
@@ -326,6 +326,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/nantes/network_equipments/gw.json b/data/grid5000/sites/nantes/network_equipments/gw.json
index dfedee1c3b5647990cb712f9b38b52981add825e..129e687754d6f32b05352f70abd13c4c80fc505c 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw.json
@@ -286,6 +286,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
index 249b539841403f8b5e1125d08a54c3a71898d40c..a367723c520b4fef4e55b12d52e1088fe9e1e495 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -183,6 +183,7 @@
       "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index 359382fa4d1524f38e52f29c68b6082fb0c15739..a4b120b93761dbbf78258732904c162fffe54d7b 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -189,6 +189,7 @@
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index 8559fb460084b01ef111fe1413b02be394c4fdfd..3cfd1a763f2a94717d00fb190374682f4276d598 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -178,6 +178,7 @@
       "snmp_pattern": "%LINECARD%/1/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "model": "Aruba 8325-48Y8C",
   "site": "rennes",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json b/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json
index e4f468298833af4e543be503b6ba5a14f853e9bd..33c41f697af50a60fa22a633a6a3a5c6e1649026 100644
--- a/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json
@@ -2024,6 +2024,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": false,
   "model": "Unknown",
   "site": "rennes",
   "snmp_community": "none",
diff --git a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
index 795f73eebb21192f92b1f40f3a157ef68fced554..6e721c6dddbf82a0c11f4357e0c370e72030a923 100644
--- a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
@@ -430,6 +430,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index 83c8e8aa033e2751131d303400c7d3a32fc559d7..25c631eeae0684df49d6d42c9777a8e328078882 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -478,6 +478,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index 51497bd70cbdef22f067332e2632acf673301720..87e4247ea69ab8a12a373ac75df2dd8058ac0177 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -482,6 +482,7 @@
       "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1.json b/data/grid5000/sites/rennes/network_equipments/sw-1.json
index d3502dba55629a007f8c9af66bfd5b1743eb978e..1cf0bfd8f7a6feef5d0948c9e0b2d91ab7a7b87d 100644
--- a/data/grid5000/sites/rennes/network_equipments/sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/sw-1.json
@@ -131,6 +131,7 @@
       "snmp_pattern": "%LINECARD%/1/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "model": "Aruba 8325-48Y8C",
   "site": "rennes",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index d34a1096c6ed3a699305f6395fd3ccac5b771b59..c723594c5f56dec7c65c03a89717dec3c0339600 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -351,6 +351,7 @@
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/sophia/network_equipments/swx1nef.json b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
index 8006c7847e08163cea13c0987fbd18c242619b09..09b92b311de653245e9268ff5534bf1340bfbd3d 100644
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
@@ -62,6 +62,7 @@
       "snmp_pattern": "Port: %PORT% Gigabit"
     }
   ],
+  "managed_by_us": true,
   "model": "Juniper EX2500-24F-FB",
   "site": "sophia",
   "snmp_community": "g5kadmin",
diff --git a/data/grid5000/sites/sophia/network_equipments/swy1nef.json b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
index 8a9c8c858ee0b463f24abdf23a1c57a25def1be0..3190fc54f2f0cafa25e6e01e9836042a58d3f09e 100644
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
@@ -224,6 +224,7 @@
       "snmp_pattern": "Port: %PORT% Gigabit"
     }
   ],
+  "managed_by_us": true,
   "model": "Dell PowerConnect 6248",
   "site": "sophia",
   "snmp_community": "g5kadmin",
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 4a5d5d38fe123ac42371ae009b3a4ac540d9a1ed..835c72a6d699431ebfc440a908acf4e43d1ff0bf 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -130,6 +130,7 @@
       "snmp_pattern": "1/%LINECARD%/%PORT%"
     }
   ],
+  "managed_by_us": true,
   "model": "Aruba 6300",
   "serial": "SG27KMX1X6",
   "site": "toulouse",
diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
index 54ee4a99453cd471a37d7305cb4f5d1458638923..9653df0958fc7ca353c75d4b778292a81300c771 100644
--- a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
+++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
@@ -30,6 +30,7 @@
       ]
     }
   ],
+  "managed_by_us": true,
   "model": "Connecttech XDG201",
   "serial": "Unknown",
   "site": "toulouse",
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index 3d19fc1bc79d9f70de9f6c15cb3a88f58a01d882..93ddf9fa4b8be97e3d69065773c2e4edd02ee712 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -4,6 +4,7 @@ gw:
   serial: H47D9Z2
   warranty: "2027-11-03"
   kind: router
+  managed_by_us: true
   alias:
     - sw-imag
     - gw-grenoble
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 9376afafb54742bccce3f215596b26a14bc02c04..14ce8d51b9624a820e1ec68b2aadccbaa58dc425 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -5,6 +5,7 @@ sw-chiclet-1:
   warranty: 2025-10-24
   ip: 172.17.47.221
   kind: switch
+  managed_by_us: true
   site: lille
   snmp_community: public
   backplane_bps: 36000000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 05e3a7b00479b95c166379351dd8587e94039326..6b80214ae45422a22b0b228d1d01aff02c99f3ae 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -11,6 +11,7 @@ sw-chiclet-2:
       ip: 172.17.47.254
   ip: 172.17.47.222
   kind: router
+  managed_by_us: true
   site: lille
   snmp_community: public
   backplane_bps: 36000000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index f65c73d553f5d2af710944ef91245be524b4ff93..a7d2e4178361f019dd6c709a814034afc7c5ac75 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -5,6 +5,7 @@ sw-chiclet-3:
   warranty: 2025-10-24
   ip: 172.17.47.223
   kind: switch
+  managed_by_us: true
   site: lille
   snmp_community: public
   backplane_bps: 36000000000000
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index 039a54427e8aada207302fff510450327528cd4c..8d92003d827c030bbd6a4f1f47db4099fe867633 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -4,6 +4,7 @@ gw:
   alias:
     - gw-luxembourg
   kind: router
+  managed_by_us: true
   site: luxembourg
   snmp_community: public
   warranty: 2018-12-01
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index 3d8bb2b57da1c6360b068bc891ca32785ddf66e0..45d3ae90c01fc56623baeda6f6d8551e0954e3c7 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -2,6 +2,7 @@
 mxl1:
   model: Force10 MXL
   kind: switch
+  managed_by_us: true
   site: luxembourg
   snmp_community: public
   warranty: expired
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index 0cd9e70987e391fc3503e59b6afa4ed634179b28..d32f5ed03ffd6df7472c67d8035882d2e3aa652c 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -2,6 +2,7 @@
 mxl2:
   model: Force10 MXL
   kind: switch
+  managed_by_us: true
   site: luxembourg
   snmp_community: public
   warranty: expired
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 7c051e7aea0204ad5311ff893372583fe9090ca3..8b3a0df85b3430062a1c214eb6171b581debbbbb 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -2,6 +2,7 @@
 ul-grid5000-sw02:
   model: cisco N5K-C5020P-BF
   kind: switch
+  managed_by_us: true
   site: luxembourg
   snmp_community: public
   warranty: expired
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index cd26f8ff33e02b835731c018ee18273220d9a558..f35bc9c103854905497107c2e8367e4a37b1d9a6 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -4,6 +4,7 @@ force10:
   serial: FGSN9T1
   warranty: 2017-07-01
   kind: switch
+  managed_by_us: true
   site: lyon
   snmp_community: public
   ip: 172.17.63.253
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index e17b7d1467eb04ce8fdfb50bb8b6613e86771f9a..7e9c8e5693fdebea8845b76652c313304a7f2b87 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -4,6 +4,7 @@ gw:
   serial: J9J1PK2
   warranty: 2024-08-15
   kind: router
+  managed_by_us: true
   alias:
     - gw-lyon
     - router
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index 0440ed12487487108bbcaf8be4d551ccc37d20a4..e2454b03bd171c384dfbe5c78256edbab3c04e0b 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -4,6 +4,7 @@ salome:
   serial: FL37068284
   warranty: expired
   kind: switch
+  managed_by_us: true
   site: lyon
   ip: 172.17.63.250
   alias:
diff --git a/input/grid5000/sites/lyon/networks/sneowise.yaml b/input/grid5000/sites/lyon/networks/sneowise.yaml
index f5ffd1a49b1c176f2f5c62e52ccba49f448ae92a..a41241126906191c525918c726a26a85606f1af3 100644
--- a/input/grid5000/sites/lyon/networks/sneowise.yaml
+++ b/input/grid5000/sites/lyon/networks/sneowise.yaml
@@ -4,6 +4,7 @@ sneowise:
   serial:
   warranty: 2024-03-31
   kind: switch
+  managed_by_us: true
   site: lyon
   snmp_community: public
   ip: 172.17.63.251
diff --git a/input/grid5000/sites/lyon/networks/sneowiseib1.yaml b/input/grid5000/sites/lyon/networks/sneowiseib1.yaml
index df672b019080a1244577c8e63e78dcd1a9b6713a..a4a63d60e9f9f1b1b914ff158a8c4c0d1dc397fc 100644
--- a/input/grid5000/sites/lyon/networks/sneowiseib1.yaml
+++ b/input/grid5000/sites/lyon/networks/sneowiseib1.yaml
@@ -3,6 +3,7 @@ sneowiseib1:
   model: Mellanox QM8700
   warranty: 2024-03-31
   kind: hpcswitch
+  managed_by_us: true
   site: lyon
   snmp_community: public
   metrics: []
diff --git a/input/grid5000/sites/lyon/networks/sneowiseib2.yaml b/input/grid5000/sites/lyon/networks/sneowiseib2.yaml
index c41eb180e04c2d5e0095fa0e3ae17ba491d3925c..1b9cbdb137030aeeed17facd595f4fd798310e9c 100644
--- a/input/grid5000/sites/lyon/networks/sneowiseib2.yaml
+++ b/input/grid5000/sites/lyon/networks/sneowiseib2.yaml
@@ -3,6 +3,7 @@ sneowiseib2:
   model: Mellanox QM8700
   warranty: 2024-03-31
   kind: hpcswitch
+  managed_by_us: true
   site: lyon
   snmp_community: public
   metrics: []
diff --git a/input/grid5000/sites/lyon/networks/swib.yaml b/input/grid5000/sites/lyon/networks/swib.yaml
index b74f0f5a89fd5058133236790c6cc9219da20555..968ea665ba0a15da5ce147460c6be4d93b47fdea 100644
--- a/input/grid5000/sites/lyon/networks/swib.yaml
+++ b/input/grid5000/sites/lyon/networks/swib.yaml
@@ -3,6 +3,7 @@ swib:
   model: Mellanox SB7800
   warranty: 2024-07-31
   kind: hpcswitch
+  managed_by_us: true
   site: lyon
   snmp_community: public
   metrics: []
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 329f2a6d4baf2eb674dbc748fbae7482b1e3b139..3591e14d23052ee04aecfacde6287873e160f499 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -3,6 +3,7 @@ gw:
   model: Cisco Nexus 9508
   warranty: 2020-09-01
   kind: router
+  managed_by_us: true
   site: nancy
   snmp_community: public
   ip: 172.16.79.254
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index 7092f976e733236210399b8b6e0a1e8fa23a9a3e..b0ff84777ec59a176fdf6f4747e193068e290f8e 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -3,6 +3,7 @@ sgraoullyib:
   model: Infiniband
   warranty: 2020-09-01
   kind: hpcswitch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   pdu:
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 249d4b7a7a587bfd1e055acfb68b86c775b52260..ab1e4426bd36c3e0a7c6e7fa44e341269bf1f253 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -3,6 +3,7 @@ sgrappe:
   model: Dell S5224F-ON
   warranty: "2025-08-07"
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index 1ae8e9f66914f4a2f9efac5cd7f8250caa860c22..76f7c5a410239d2bede2d725f77429041411ac81 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -3,6 +3,7 @@ sgrcinq:
   model: Cisco WS-C2960X-48TD-L
   warranty: "2028-11-28"  # see bug 9837
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
index 30de9a9b09c294bc23ef0d8bc3328decdb786953..e153d4df63ed5cbfaa72f30874eca94f677a1cb8 100644
--- a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
@@ -4,6 +4,7 @@ sgrele-opf:
   model: Omni-Path
   warranty: 2022-06-01
   kind: hpcswitch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   ip: 172.17.79.253
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index a8a5ab682fa3fc410a34169239ac0eed442e8b13..cc1a978d16b8fe1b244c9ebdcdae4e2bba929f81 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -3,6 +3,7 @@ sgrisou1:
   model: Dell S3048
   warranty: 2022-06-01
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   pdu:
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 48e3ceaac830bed7c232f83c389a83aca6add39b..28008f722071ca67e44e2524ffc2d75b2a80b01d 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -3,6 +3,7 @@ sgros1:
   model: Dell Z9264F-ON
   warranty: "2026-07-11"
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   ip: 172.17.79.208
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index badb5a612f50129035a141acb7648f94aa6d1420..6ba234f63629549867b2237f0a973909f684ec17 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -3,6 +3,7 @@ sgros2:
   model: Dell Z9264F-ON
   warranty: "2026-07-11"
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index 5d0a950a37d544ea0c484225f1a5403d0a75cf4b..6b61b1582a3148dd68ffb3fb1e878ba1359c1e75 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -3,6 +3,7 @@ sgruss:
   model: Dell S5224F-ON
   warranty: "2026-08-02"
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index b1d435f62f634786590af7eded92b40f16c871be..dc4fa61b5a100ea2fb7f8fcebc08c693575439b0 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -3,6 +3,7 @@ sgrvingt:
   model: Dell S4048
   warranty: "2023-03-27"
   kind: switch
+  managed_by_us: true
   site: nancy
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index bc8119ef3ea7497e769a47b393c036906ad62f86..dd8567b81dea1aeafe83195827e5f9b1b3744a51 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -2,6 +2,7 @@
 ecotype-prod1:
   model: S4048-ON
   kind: switch
+  managed_by_us: true
   site: nantes
   ip: 172.16.207.252
   snmp_community: public
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index 3be515e7e35ef5ed77d56f93cae94fb7e9d79568..067281d2a5d2473079f35902129ade591388fbe0 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -2,6 +2,7 @@
 ecotype-prod2:
   model: S4048-ON
   kind: switch
+  managed_by_us: true
   site: nantes
   ip: 172.16.207.251
   snmp_community: public
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index 619664071cb6c4f1a24608b3d4e1c5df868632ce..790f0ce96afe1ee9d27a610619b503c5f3020c4c 100644
--- a/input/grid5000/sites/nantes/networks/gw-nantes.yaml
+++ b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
@@ -2,6 +2,7 @@
 gw:
   model: Force10 S4810
   kind: router
+  managed_by_us: true
   site: nantes
   ip: 172.16.207.254
   ip6: 2001:660:4406:600::ffff:ffff
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index 48a982f28741ea19d7249a91b7b937e305e130ed..607ee484c0fe59767bd5939de468adf70026ab6c 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -3,6 +3,7 @@ bigdata-sw:
   model: Force10 S4810
   warranty: 2018-10-01
   kind: switch
+  managed_by_us: true
   site: rennes
   snmp_community: public
   ip: 172.17.111.203
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 470f4d94f065504ffd286a4abfee10704e18f27c..4946bd2e5d33d8b0e3d9f49354d661a6183a5a9a 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -3,6 +3,7 @@ c6509:
   model: Cisco WS-C6509-E
   warranty: "expired"
   kind: switch
+  managed_by_us: true
   site: rennes
   snmp_community: privkavlan
   ip: 172.17.111.207
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index 717bb969fbfe295e36689cc58a25f2279bdcd7f9..dedf0d64f5d75e9b2f7900c6f6de2d0efe31100f 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -3,6 +3,7 @@ gw:
   model: Aruba 8325-48Y8C
   warranty: 
   kind: router
+  managed_by_us: true
   site: rennes
   snmp_community: public
   ip: 172.17.111.211
diff --git a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml b/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
index 27da6614e9083787b6d773df0bbfc0552354cd07..1363676e0928a293d72f0aa3049c4d51c1316f1f 100644
--- a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
@@ -3,6 +3,7 @@ mc-fake-sw:
   model: Unknown
   warranty: N/A
   kind: switch
+  managed_by_us: false
   snmp_community: none
   site: rennes
   linecards:
diff --git a/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
index 074cd8657f921d9110c687931027c56df448fc31..1f0e98462ab8f672da55873372a0fc3408c131a4 100644
--- a/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
@@ -3,6 +3,7 @@ parasilo-sw-1:
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: switch
+  managed_by_us: true
   site: rennes
   snmp_community: public
   ip: 172.17.111.204
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index ea38e4c4dbead0ff2065f44f53870c4b21825a4e..c82d1200066b8be5d6d53ee4a24157929f9fe9eb 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -3,6 +3,7 @@ paravance-sw-1:
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: switch
+  managed_by_us: true
   site: rennes
   snmp_community: public
   ip: 172.17.111.206
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index 9a7d756c26fa174a066c9017371974a1d91b8968..16ee6dd3a4ed2f11c54fe877bec21894372ba2ee 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -3,6 +3,7 @@ paravance-sw-2:
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: switch
+  managed_by_us: true
   site: rennes
   snmp_community: public
   ip: 172.17.111.205
diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml
index e53339ed4d994f70ebca93fe5743254cb520a610..e6a61a9cb9fefced459025b27d44c838c34bee67 100644
--- a/input/grid5000/sites/rennes/networks/sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/sw-1.yaml
@@ -3,6 +3,7 @@ sw-1:
   model: Aruba 8325-48Y8C
   warranty:
   kind: switch
+  managed_by_us: true
   site: rennes
   ip: 172.17.111.212
   snmp_community: public
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index a4f83d191906bb6848cf42337034d5697e85a112..55b547ee7e4497a5c8113e5b1d7cd0b66bf64037 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -3,6 +3,7 @@ gw:
   model: Foundry
   warranty: expired
   kind: router
+  managed_by_us: true
   site: sophia
   snmp_community: public
   metrics:
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
index 677a0803305c89f558efb909c1dba7a9d5e6996c..ee65099afc74fd278a94b109c8bce0b8ab9e6fa3 100644
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swx1nef.yaml
@@ -3,6 +3,7 @@ swx1nef:
   model: Juniper EX2500-24F-FB
   warranty: expired
   kind: switch
+  managed_by_us: true
   site: sophia
   snmp_community: g5kadmin
   backplane_bps: 240000000000
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
index 153e35890bf674ab17b0db02781f8fae5f3d5167..fa2f9097afde36e67967272485deb60cd894891f 100644
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swy1nef.yaml
@@ -3,6 +3,7 @@ swy1nef:
   model: Dell PowerConnect 6248
   warranty: expired
   kind: switch
+  managed_by_us: true
   site: sophia
   snmp_community: g5kadmin
   ip: 172.16.143.249
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
index 0af38abf980a040c6d9701a29ba45ba9036c8caa..008d02960a94dafa52074d24ef221468b4036e9e 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -7,6 +7,7 @@ gw-toulouse:
   ip: 172.17.127.254
   ip6: 2001:660:4406:900::ffff:ffff
   kind: router
+  managed_by_us: true
   site: toulouse
   snmp_community: g5kadmin
   vlans:
diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
index f06e2d511d6067989dd9a875b7b5f239a4aa846c..214431c736f438f91a1446a1772c720eb55c8a6b 100644
--- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml
+++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
@@ -8,6 +8,7 @@ sw-estats:
     - sw-uagx
   ip: 172.17.127.252
   kind: switch
+  managed_by_us: true
   linecards:
     1:
       ports:
diff --git a/lib/refrepo/gen/puppet/kwollectg5k.rb b/lib/refrepo/gen/puppet/kwollectg5k.rb
index 639b607e2814811079738f050bd34bf7ee346ef5..d53011bb9c5813554952246e428b4c39f0806a1d 100644
--- a/lib/refrepo/gen/puppet/kwollectg5k.rb
+++ b/lib/refrepo/gen/puppet/kwollectg5k.rb
@@ -49,8 +49,8 @@ def generate_puppet_kwollectg5k(options)
     # Metrics configuration for network device
     site['network_equipments'].each { |neteq_uid, neteq|
 
-      # do not apply to fake equipment
-      next if neteq_uid.include? 'fake'
+      # do not apply to equipment we do not manage
+      next if !neteq['managed_by_us']
 
       output = ERB.new(File.read(File.expand_path('templates/kwollect-network.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding)
       output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kwollect/#{site_uid}/#{neteq_uid}.conf")
diff --git a/lib/refrepo/gen/puppet/network_monitoring.rb b/lib/refrepo/gen/puppet/network_monitoring.rb
index 9fb9fe411512eeb2c21f971b5bc6d1a926253118..daccb0a31855f77839a2396bc5b52a3300baddd6 100644
--- a/lib/refrepo/gen/puppet/network_monitoring.rb
+++ b/lib/refrepo/gen/puppet/network_monitoring.rb
@@ -34,8 +34,8 @@ def generate_puppet_network_monitoring(options)
 
       # do not apply to HPC switch
       next if eq_v['kind'] == 'hpcswitch'
-      # do not apply to fake equipment
-      next if eq_name.include? "fake"
+      # do not apply to equipment we do not manage
+      next if !eq_v['managed_by_us']
 
       snmp_hosts << fqdn_eq_name unless
         snmp_hosts.find { |i| i == fqdn_eq_name }
diff --git a/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml b/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
index 7455eac44ff6e77fc6cae468364fcdbba0281b43..0b6badeba17738e452ec76e8169235c1bad16ef0 100644
--- a/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
@@ -5,6 +5,7 @@ kind:
   - router
   - switch
   - hpcswitch
+managed_by_us: boolean
 serial: optional_string
 site: string
 alias: optional_array
diff --git a/lib/refrepo/valid/network.rb b/lib/refrepo/valid/network.rb
index f6ae483c1cc51c5b9dbea9ea3c75cbc8ec724342..64f7bc3ef5150c38bfbe59112d3508e59084790b 100644
--- a/lib/refrepo/valid/network.rb
+++ b/lib/refrepo/valid/network.rb
@@ -230,7 +230,7 @@ def check_network_description(options)
 
     # find netnodes without connection
     # for routers, it's OK, because they would be connected to other G5K routers
-    netnodes.select { |n| n['found'] == 0 and not n['kind'] == 'router' and not n['uid'].include? "fake" }.each do |n|
+    netnodes.select { |n| n['found'] == 0 and n['kind'] != 'router' }.each do |n|
       if n['interface'] == 'InfiniBand' or n['interface'] == 'Myrinet' or n['interface'] == 'Omni-Path' or hpc_switch?(n)
         puts "WARNING: we did not find a corresponding entry on a network equipment for this InfiniBand node: #{n}"
       else