From 8060ce19c2b370b344a9267553dbf40c1ef75531 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Wed, 4 Jul 2012 13:55:32 +0200
Subject: [PATCH] [nancy] Adding sgrapheneib and sgriffonib, but they do not
 have any cacti graph

---
 .../nancy/network_equipments/sgraphene1.json  |  3 ++
 .../nancy/network_equipments/sgraphene2.json  |  3 ++
 .../nancy/network_equipments/sgraphene3.json  |  3 ++
 .../nancy/network_equipments/sgraphene4.json  |  3 ++
 .../nancy/network_equipments/sgrapheneib.json | 32 +++++++++++++++++++
 .../nancy/network_equipments/sgravillon1.json |  6 +++-
 .../nancy/network_equipments/sgriffon1.json   |  3 ++
 .../nancy/network_equipments/sgriffon2.json   |  3 ++
 .../nancy/network_equipments/sgriffon3.json   |  3 ++
 .../nancy/network_equipments/sgriffonib.json  | 32 +++++++++++++++++++
 .../nancy/network_equipments/stalc1.json      |  3 ++
 .../nancy/network_equipments/stalc2.json      |  3 ++
 .../nancy/network_equipments/stalc3.json      |  3 ++
 .../nancy/network_equipments/stalc4.json      |  3 ++
 .../sites/nancy/net-links/sgrapheneib.yaml    | 21 ++++++++++++
 .../sites/nancy/net-links/sgravillon1.yaml    |  3 +-
 .../sites/nancy/net-links/sgriffonib.yaml     | 21 ++++++++++++
 17 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
 create mode 100644 data/grid5000/sites/nancy/network_equipments/sgriffonib.json
 create mode 100644 generators/input/sites/nancy/net-links/sgrapheneib.yaml
 create mode 100644 generators/input/sites/nancy/net-links/sgriffonib.yaml

diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
index 92fca97f36e..9532d6a3861 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
@@ -167,5 +167,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
index 227208659cd..e356e4cbfd0 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
@@ -152,5 +152,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
index 671915c471f..c95c8782ff5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -137,5 +137,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
index 6f4d2032acc..e704ce66728 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
@@ -164,5 +164,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
new file mode 100644
index 00000000000..b1b768d057a
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
@@ -0,0 +1,32 @@
+{
+  "channels": {
+    "naming_pattern": "Po%CHANNELID%"
+  },
+  "kind": "switch",
+  "linecards": [
+    {
+      "kind": "router",
+      "naming_pattern": "%LINECARD%/%PORT%",
+      "ports": [
+        {
+          "uid": "sgravillon1"
+        }
+      ],
+      "rate": 10000000000
+    }
+  ],
+  "model": "Infiniband",
+  "routes": {
+
+  },
+  "site": "nancy",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sgrapheneib",
+  "vlans": {
+    "naming_pattern": "Vlan%VLANID%"
+  },
+  "weathermap": {
+    "use_cacti": "no"
+  }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
index 52747e9ec0c..af87b710d6e 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
@@ -15,7 +15,7 @@
 
         },
         {
-          "kind": "other",
+          "kind": "switch",
           "uid": "sgrapheneib"
         },
         {
@@ -33,6 +33,7 @@
 
         },
         {
+          "kind": "switch",
           "uid": "sgriffonib"
         },
         {
@@ -206,5 +207,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
index e532e22b497..3a8cdf8e5ce 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -176,5 +176,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
index d0424efc7ef..d7b66494855 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
@@ -173,5 +173,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
index ce94b4279f5..ff487b095da 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
@@ -176,5 +176,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffonib.json b/data/grid5000/sites/nancy/network_equipments/sgriffonib.json
new file mode 100644
index 00000000000..06abec2b3f3
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffonib.json
@@ -0,0 +1,32 @@
+{
+  "channels": {
+    "naming_pattern": "Po%CHANNELID%"
+  },
+  "kind": "switch",
+  "linecards": [
+    {
+      "kind": "router",
+      "naming_pattern": "%LINECARD%/%PORT%",
+      "ports": [
+        {
+          "uid": "sgravillon1"
+        }
+      ],
+      "rate": 10000000000
+    }
+  ],
+  "model": "Infiniband",
+  "routes": {
+
+  },
+  "site": "nancy",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sgriffonib",
+  "vlans": {
+    "naming_pattern": "Vlan%VLANID%"
+  },
+  "weathermap": {
+    "use_cacti": "no"
+  }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json
index 91dd3e0debd..a3a4ad774b0 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -194,5 +194,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc2.json b/data/grid5000/sites/nancy/network_equipments/stalc2.json
index f0c536c2312..587a34d5ae9 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc2.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc2.json
@@ -189,5 +189,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc3.json b/data/grid5000/sites/nancy/network_equipments/stalc3.json
index 41fd6f22eaf..1d08e8e0183 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc3.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc3.json
@@ -173,5 +173,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan-interface%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc4.json b/data/grid5000/sites/nancy/network_equipments/stalc4.json
index 77b4e3f290e..79b87d7a811 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc4.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc4.json
@@ -40,5 +40,8 @@
       "administrative": true
     },
     "naming_pattern": "Vlan%VLANID%"
+  },
+  "weathermap": {
+
   }
 }
\ No newline at end of file
diff --git a/generators/input/sites/nancy/net-links/sgrapheneib.yaml b/generators/input/sites/nancy/net-links/sgrapheneib.yaml
new file mode 100644
index 00000000000..8fc01c127ef
--- /dev/null
+++ b/generators/input/sites/nancy/net-links/sgrapheneib.yaml
@@ -0,0 +1,21 @@
+--- 
+sgrapheneib: 
+  model: Infiniband
+  kind: switch
+  site: nancy
+  snmp_community: public
+  weathermap: 
+    use_cacti: "no"
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: router
+      rate: 10000000000
+      ports: 
+        0: sgravillon1
+  channels: 
+    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgravillon1.yaml b/generators/input/sites/nancy/net-links/sgravillon1.yaml
index 37534dc6507..d1ec95b4111 100644
--- a/generators/input/sites/nancy/net-links/sgravillon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgravillon1.yaml
@@ -19,7 +19,7 @@ sgravillon1:
       rate: 1000000000
       ports: 
         1: 
-          kind: other
+          kind: switch
           uid: sgrapheneib
         2: 
           port: bmc
@@ -30,6 +30,7 @@ sgravillon1:
           kind: switch
           uid: stalc1
         6: 
+          kind: switch
           uid: sgriffonib
         7: grimoire
         8: 
diff --git a/generators/input/sites/nancy/net-links/sgriffonib.yaml b/generators/input/sites/nancy/net-links/sgriffonib.yaml
new file mode 100644
index 00000000000..87140b1a918
--- /dev/null
+++ b/generators/input/sites/nancy/net-links/sgriffonib.yaml
@@ -0,0 +1,21 @@
+--- 
+sgriffonib: 
+  model: Infiniband
+  kind: switch
+  site: nancy
+  snmp_community: public
+  weathermap: 
+    use_cacti: "no"
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: router
+      rate: 10000000000
+      ports: 
+        0: sgravillon1
+  channels: 
+    naming_pattern: Po%CHANNELID%
-- 
GitLab