From 7ef07b7b0d34384e5436adb8389ac97e41908edd Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Mon, 12 Nov 2012 09:53:18 +0100
Subject: [PATCH] [Grenoble] add trunk port #4367
---
.../sites/grenoble/network_equipments/blade-1.json | 8 ++++++++
.../sites/grenoble/network_equipments/blade-2.json | 8 ++++++++
.../sites/grenoble/network_equipments/blade-3.json | 8 ++++++++
.../sites/grenoble/network_equipments/blade-4.json | 8 ++++++++
.../input/sites/grenoble/net-links/blade-1.yaml | 12 +++++++++---
.../input/sites/grenoble/net-links/blade-2.yaml | 6 ++++++
.../input/sites/grenoble/net-links/blade-3.yaml | 6 ++++++
.../input/sites/grenoble/net-links/blade-4.yaml | 8 +++++++-
8 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-1.json b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
index 5a20db9ac55..7de67b2999c 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
@@ -14,6 +14,14 @@
{
"port": "2:1",
"uid": "gw-grenoble"
+ },
+ {
+ "port": "2:2",
+ "uid": "gw-grenoble"
+ },
+ {
+ "port": "2:3",
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-2.json b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
index d846b1b515d..bd814e4d36f 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-2.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
@@ -14,6 +14,14 @@
{
"port": "2:4",
"uid": "gw-grenoble"
+ },
+ {
+ "port": "2:5",
+ "uid": "gw-grenoble"
+ },
+ {
+ "port": "2:6",
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-3.json b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
index 6c6ddb255f0..05ee7c5aa10 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-3.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
@@ -14,6 +14,14 @@
{
"port": "2:7",
"uid": "gw-grenoble"
+ },
+ {
+ "port": "2:8",
+ "uid": "gw-grenoble"
+ },
+ {
+ "port": "2:9",
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-4.json b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
index 751559aeb61..32ab39ac8cf 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-4.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
@@ -14,6 +14,14 @@
{
"port": "2:10",
"uid": "gw-grenoble"
+ },
+ {
+ "port": "2:11",
+ "uid": "gw-grenoble"
+ },
+ {
+ "port": "2:12",
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/generators/input/sites/grenoble/net-links/blade-1.yaml b/generators/input/sites/grenoble/net-links/blade-1.yaml
index 64725bd6bd8..504948d5f02 100644
--- a/generators/input/sites/grenoble/net-links/blade-1.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-1.yaml
@@ -15,11 +15,17 @@ blade-1:
naming_pattern: "%LINECARD%/%PORT%"
kind: router
rate: 1000000000
- ports:
- 1:
+ ports:
+ 1:
uid: gw-grenoble
port: "2:1"
- 1:
+ 2:
+ uid: gw-grenoble
+ port: "2:2"
+ 3:
+ uid: gw-grenoble
+ port: "2:3"
+ 1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
rate: 1000000000
diff --git a/generators/input/sites/grenoble/net-links/blade-2.yaml b/generators/input/sites/grenoble/net-links/blade-2.yaml
index 78e802962ea..1486638db14 100644
--- a/generators/input/sites/grenoble/net-links/blade-2.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-2.yaml
@@ -19,6 +19,12 @@ blade-2:
1:
uid: gw-grenoble
port: "2:4"
+ 2:
+ uid: gw-grenoble
+ port: "2:5"
+ 3:
+ uid: gw-grenoble
+ port: "2:6"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-3.yaml b/generators/input/sites/grenoble/net-links/blade-3.yaml
index 825121fd23a..90b996e9a7e 100644
--- a/generators/input/sites/grenoble/net-links/blade-3.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-3.yaml
@@ -19,6 +19,12 @@ blade-3:
1:
uid: gw-grenoble
port: "2:7"
+ 2:
+ uid: gw-grenoble
+ port: "2:8"
+ 3:
+ uid: gw-grenoble
+ port: "2:9"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-4.yaml b/generators/input/sites/grenoble/net-links/blade-4.yaml
index ed7f96f3be7..18efb73deea 100644
--- a/generators/input/sites/grenoble/net-links/blade-4.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-4.yaml
@@ -19,7 +19,13 @@ blade-4:
1:
uid: gw-grenoble
port: "2:10"
- 1:
+ 2:
+ uid: gw-grenoble
+ port: "2:11"
+ 3:
+ uid: gw-grenoble
+ port: "2:12"
+ 1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
rate: 1000000000
--
GitLab