Commit 3ac01eed authored by LOUP David's avatar LOUP David
Browse files

[grenoble] Describe aggregation link (bug 8588)

parent 86b8510b
...@@ -18,50 +18,62 @@ ...@@ -18,50 +18,62 @@
{ {
}, },
{ {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
{ {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
{ {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
{ {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
{ {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
{ {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
{ {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-3" "uid": "sw-edel-3"
}, },
{ {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-3" "uid": "sw-edel-3"
}, },
{ {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-3" "uid": "sw-edel-3"
}, },
{ {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
{ {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
{ {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
......
...@@ -80,16 +80,19 @@ ...@@ -80,16 +80,19 @@
{ {
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:4", "port": "2:4",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:5", "port": "2:5",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:6", "port": "2:6",
"uid": "gw-grenoble" "uid": "gw-grenoble"
......
...@@ -80,16 +80,19 @@ ...@@ -80,16 +80,19 @@
{ {
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:1", "port": "2:1",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:2", "port": "2:2",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:3", "port": "2:3",
"uid": "gw-grenoble" "uid": "gw-grenoble"
......
...@@ -80,16 +80,19 @@ ...@@ -80,16 +80,19 @@
{ {
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:7", "port": "2:7",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:8", "port": "2:8",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:9", "port": "2:9",
"uid": "gw-grenoble" "uid": "gw-grenoble"
......
...@@ -80,16 +80,19 @@ ...@@ -80,16 +80,19 @@
{ {
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:10", "port": "2:10",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:11", "port": "2:11",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
{ {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:12", "port": "2:12",
"uid": "gw-grenoble" "uid": "gw-grenoble"
......
...@@ -21112,22 +21112,27 @@ ...@@ -21112,22 +21112,27 @@
"kind": "switch", "kind": "switch",
"ports": { "ports": {
"1": { "1": {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
"10": { "10": {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
"11": { "11": {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
"12": { "12": {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-4" "uid": "sw-edel-4"
}, },
"2": { "2": {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
...@@ -21151,30 +21156,37 @@ ...@@ -21151,30 +21156,37 @@
"uid": "digsed" "uid": "digsed"
}, },
"3": { "3": {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-2" "uid": "sw-edel-2"
}, },
"4": { "4": {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
"5": { "5": {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
"6": { "6": {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-1" "uid": "sw-edel-1"
}, },
"7": { "7": {
"aggregation": "trunk",
"port": "0/1", "port": "0/1",
"uid": "sw-edel-3" "uid": "sw-edel-3"
}, },
"8": { "8": {
"aggregation": "trunk",
"port": "0/2", "port": "0/2",
"uid": "sw-edel-3" "uid": "sw-edel-3"
}, },
"9": { "9": {
"aggregation": "trunk",
"port": "0/3", "port": "0/3",
"uid": "sw-edel-3" "uid": "sw-edel-3"
} }
...@@ -21574,16 +21586,19 @@ ...@@ -21574,16 +21586,19 @@
"21": "edel-16", "21": "edel-16",
"22": "edel-15", "22": "edel-15",
"25": { "25": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:4", "port": "2:4",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"26": { "26": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:5", "port": "2:5",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"27": { "27": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:6", "port": "2:6",
"uid": "gw-grenoble" "uid": "gw-grenoble"
...@@ -21643,16 +21658,19 @@ ...@@ -21643,16 +21658,19 @@
"21": "edel-35", "21": "edel-35",
"22": "edel-36", "22": "edel-36",
"25": { "25": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:1", "port": "2:1",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"26": { "26": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:2", "port": "2:2",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"27": { "27": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:3", "port": "2:3",
"uid": "gw-grenoble" "uid": "gw-grenoble"
...@@ -21712,16 +21730,19 @@ ...@@ -21712,16 +21730,19 @@
"21": "edel-53", "21": "edel-53",
"22": "edel-54", "22": "edel-54",
"25": { "25": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:7", "port": "2:7",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"26": { "26": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:8", "port": "2:8",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"27": { "27": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:9", "port": "2:9",
"uid": "gw-grenoble" "uid": "gw-grenoble"
...@@ -21781,16 +21802,19 @@ ...@@ -21781,16 +21802,19 @@
"21": "edel-71", "21": "edel-71",
"22": "edel-72", "22": "edel-72",
"25": { "25": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:10", "port": "2:10",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"26": { "26": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:11", "port": "2:11",
"uid": "gw-grenoble" "uid": "gw-grenoble"
}, },
"27": { "27": {
"aggregation": "trunk",
"kind": "router", "kind": "router",
"port": "2:12", "port": "2:12",
"uid": "gw-grenoble" "uid": "gw-grenoble"
...@@ -113054,73 +113078,33 @@ ...@@ -113054,73 +113078,33 @@
} }
}, },
"griffon-30": { "griffon-30": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-31": { "griffon-31": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-32": { "griffon-32": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-33": { "griffon-33": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-34": { "griffon-34": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-35": { "griffon-35": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-36": { "griffon-36": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-37": { "griffon-37": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-38": { "griffon-38": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-39": { "griffon-39": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-4": { "griffon-4": {
...@@ -113319,73 +113303,33 @@ ...@@ -113319,73 +113303,33 @@
"uid": "griffon-4" "uid": "griffon-4"
}, },
"griffon-40": { "griffon-40": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-41": { "griffon-41": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-42": { "griffon-42": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
}, },
"griffon-43": { "griffon-43": {
"monitoring": {
"metric": "power",
"wattmeter": "shared"
},
"status": "retired" "status": "retired"
},