From 99e4907ce071fa8ad2cfba406c81dca4d50d68dc Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Thu, 21 Feb 2013 13:43:54 +0100
Subject: [PATCH] [sophia] - Rename CiscoSol -
---
.../sophia/network_equipments/{ciscosol.json => cisco.json} | 2 +-
data/grid5000/sites/sophia/network_equipments/gw-sophia.json | 2 +-
.../input/sites/sophia/net-links/{ciscosol.yaml => cisco.yaml} | 2 +-
generators/input/sites/sophia/net-links/gw-sophia.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename data/grid5000/sites/sophia/network_equipments/{ciscosol.json => cisco.json} (99%)
rename generators/input/sites/sophia/net-links/{ciscosol.yaml => cisco.yaml} (99%)
diff --git a/data/grid5000/sites/sophia/network_equipments/ciscosol.json b/data/grid5000/sites/sophia/network_equipments/cisco.json
similarity index 99%
rename from data/grid5000/sites/sophia/network_equipments/ciscosol.json
rename to data/grid5000/sites/sophia/network_equipments/cisco.json
index 143f011db1b..575d1d99309 100644
--- a/data/grid5000/sites/sophia/network_equipments/ciscosol.json
+++ b/data/grid5000/sites/sophia/network_equipments/cisco.json
@@ -252,7 +252,7 @@
"site": "sophia",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "ciscosol",
+ "uid": "cisco",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json b/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
index f7ad9708be7..61127fe4285 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
@@ -482,7 +482,7 @@
{
"kind": "switch",
"port": "1/0/1",
- "uid": "ciscosol"
+ "uid": "cisco"
},
{
"uid": "sw-myrinet"
diff --git a/generators/input/sites/sophia/net-links/ciscosol.yaml b/generators/input/sites/sophia/net-links/cisco.yaml
similarity index 99%
rename from generators/input/sites/sophia/net-links/ciscosol.yaml
rename to generators/input/sites/sophia/net-links/cisco.yaml
index 4c4891a3e70..674a1668801 100644
--- a/generators/input/sites/sophia/net-links/ciscosol.yaml
+++ b/generators/input/sites/sophia/net-links/cisco.yaml
@@ -1,5 +1,5 @@
---
-ciscosol:
+cisco:
model: cisco
kind: switch
site: sophia
diff --git a/generators/input/sites/sophia/net-links/gw-sophia.yaml b/generators/input/sites/sophia/net-links/gw-sophia.yaml
index 8cbb0e3b655..0f20ce80f8a 100644
--- a/generators/input/sites/sophia/net-links/gw-sophia.yaml
+++ b/generators/input/sites/sophia/net-links/gw-sophia.yaml
@@ -129,7 +129,7 @@ gw-sophia:
2: newservices
4: services2
5:
- uid: ciscosol
+ uid: cisco
port: 1/0/1
kind: switch
6: sw-myrinet
--
GitLab