Merge branch 'kavlanng_mono_site' into 'master'

[kavlanng] add "trunk: false" to all network device ports where needed.

See merge request !1315

data/grid5000/sites/lille/network_equipments/sw-1.json

@@ -225,6 +225,7 @@
           "kind": "switch",
           "rate": 1000000000,
           "snmp_name": "1/1/47",
+          "trunk": false,
           "uid": "sw-admin6"
         },
         {

data/grid5000/sites/lille/network_equipments/sw-admin6.json

@@ -98,6 +98,7 @@
         {
           "kind": "switch",
           "snmp_name": "24",
+          "trunk": false,
           "uid": "sw-1"
         }
       ],

data/grid5000/sites/rennes/network_equipments/sw-adm-1.json

@@ -195,6 +195,7 @@
         {
           "kind": "router",
           "snmp_name": "1/1/44",
+          "trunk": false,
           "uid": "gw"
         },
         {

data/grid5000/sites/sophia/network_equipments/sw-2.json

@@ -174,6 +174,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/50",
+          "trunk": false,
           "uid": "swadmin-2"
         }
       ],

data/grid5000/sites/sophia/network_equipments/sw-3.json

@@ -260,6 +260,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/52",
+          "trunk": false,
           "uid": "swadmin-3"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-2.json

@@ -101,6 +101,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
+          "trunk": false,
           "uid": "sw-2"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-3.json

@@ -125,12 +125,14 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
+          "trunk": false,
           "uid": "sw-3"
         },
         {
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/26",
+          "trunk": false,
           "uid": "swadmin-4"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-4.json

@@ -89,6 +89,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
+          "trunk": false,
           "uid": "swadmin-3"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-5.json

@@ -71,6 +71,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
+          "trunk": false,
           "uid": "sw-5"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-6.json

@@ -98,6 +98,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
+          "trunk": false,
           "uid": "sw-6"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-7.json

@@ -71,6 +71,7 @@
         {
           "kind": "switch",
           "snmp_name": "24",
+          "trunk": false,
           "uid": "sw-7"
         }
       ],

input/grid5000/sites/lille/networks/sw-1.yaml

@@ -74,6 +74,7 @@ sw-1:
           uid: sw-admin6
           kind: switch
           rate: 1000000000
+          trunk: false
         48:
           uid: sw-chiclet-2
           kind: switch

input/grid5000/sites/lille/networks/sw-admin6.yaml

@@ -56,3 +56,4 @@ sw-admin6:
         24:
           uid: sw-1
           kind: switch
+          trunk: false

input/grid5000/sites/rennes/networks/sw-adm-1.yaml

@@ -113,6 +113,7 @@ sw-adm-1:
         44:
           uid: gw
           kind: router
+          trunk: false
         45:
           uid: paradoxe-pdu1
           kind: other

input/grid5000/sites/sophia/networks/sw-2.yaml

@@ -69,3 +69,4 @@ sw-2:
           uid: swadmin-2
           kind: switch
           rate: 10000000000
+          trunk: false

input/grid5000/sites/sophia/networks/sw-3.yaml

@@ -92,3 +92,4 @@ sw-3:
           uid: swadmin-3
           kind: switch
           rate: 10000000000
+          trunk: false

input/grid5000/sites/sophia/networks/swadmin-2.yaml

@@ -57,3 +57,4 @@ swadmin-2:
           uid: sw-2
           kind: switch
           rate: 10000000000
+          trunk: false

input/grid5000/sites/sophia/networks/swadmin-3.yaml

@@ -81,7 +81,9 @@ swadmin-3:
            uid: sw-3
            kind: switch
            rate: 10000000000
+           trunk: false
         26:
            uid: swadmin-4
            kind: switch
            rate: 10000000000
+           trunk: false

input/grid5000/sites/sophia/networks/swadmin-4.yaml

@@ -45,4 +45,4 @@ swadmin-4:
           uid: swadmin-3
           kind: switch
           rate: 10000000000
-
+          trunk: false

input/grid5000/sites/sophia/networks/swadmin-5.yaml

@@ -27,3 +27,4 @@ swadmin-5:
           uid: sw-5
           kind: switch
           rate: 10000000000
+          trunk: false