From 328102f9ce416a848f631d76dc81a4fab918f43a Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Mon, 24 Feb 2020 08:54:58 +0100
Subject: [PATCH] [nancy] fix pattern on sgros{1,2} uplink with gw
---
data/grid5000/sites/nancy/network_equipments/sgros1.json | 6 +++---
data/grid5000/sites/nancy/network_equipments/sgros2.json | 6 +++---
input/grid5000/sites/nancy/networks/sgros1.yaml | 4 ++--
input/grid5000/sites/nancy/networks/sgros2.yaml | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index 4e1a91ccd59..6e1e1ae8437 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -14,7 +14,7 @@
{
},
{
- "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
+ "kavlan_pattern": "ethernet1/1/%PORT%:1",
"ports": [
{
},
@@ -25,12 +25,12 @@
},
{
"kind": "channel",
- "snmp_name": "ethernet1/1/1:2",
+ "snmp_name": "ethernet1/1/2:1",
"uid": "port-channel1"
}
],
"rate": 40000000000,
- "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
+ "snmp_pattern": "ethernet1/1/%PORT%:1"
},
{
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 71170a9d53b..a861c1215ca 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -14,7 +14,7 @@
{
},
{
- "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
+ "kavlan_pattern": "ethernet1/1/%PORT%:1",
"ports": [
{
},
@@ -25,12 +25,12 @@
},
{
"kind": "channel",
- "snmp_name": "ethernet1/1/1:2",
+ "snmp_name": "ethernet1/1/2:1",
"uid": "port-channel1"
}
],
"rate": 40000000000,
- "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
+ "snmp_pattern": "ethernet1/1/%PORT%:1"
},
{
},
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 6c8d5b6ff62..efe40663d75 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -10,8 +10,8 @@ sgros1:
backplane_bps: 6400000000000
linecards:
1:
- snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
- kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+ snmp_pattern: "ethernet1/1/%PORT%:1"
+ kavlan_pattern: "ethernet1/1/%PORT%:1"
rate: 40_000_000_000
ports:
1:
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 2d09d51013a..8c8a7381894 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -10,8 +10,8 @@ sgros2:
backplane_bps: 6400000000000
linecards:
1:
- snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
- kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+ snmp_pattern: "ethernet1/1/%PORT%:1"
+ kavlan_pattern: "ethernet1/1/%PORT%:1"
rate: 40_000_000_000
ports:
1:
--
GitLab