[nancy] network-api - added mode precision in description

645ea1b6 · Gaetan SIMO · 7feed9c1 · 645ea1b6 · 645ea1b6 · 645ea1b6
Commit 645ea1b6 authored May 27, 2012 by Gaetan SIMO
16 changed files
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
@@ -4,9 +4,12 @@
  },
  "kind": "switch",
  "linecards": [
+    {
+
+    },
    {
      "kind": "node",
-      "naming_pattern": "%PORT%",
+      "naming_pattern": "%LINECARD:A%%PORT%",
      "ports": [
        {


--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -160,7 +160,7 @@
      "rate": 10000000000
    },
    {
-      "kind": "switch",
+      "kind": "router",
      "naming_pattern": "T%LINECARD%/%PORT%",
      "ports": [
        {

--- a/generators/input/sites/nancy/net-links/sgraphene1.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene1.yaml
@@ -9,8 +9,8 @@ sgraphene1:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -53,7 +53,7 @@ sgraphene1:
        38: graphene-37
        37: graphene-38
        40: graphene-39
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgraphene2.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene2.yaml
@@ -9,8 +9,8 @@ sgraphene2:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -49,7 +49,7 @@ sgraphene2:
        33: graphene-72
        34: graphene-73
        35: graphene-74
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgraphene3.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene3.yaml
@@ -9,8 +9,8 @@ sgraphene3:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -44,7 +44,7 @@ sgraphene3:
        27: graphene-102
        30: graphene-103
        29: graphene-104
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgraphene4.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene4.yaml
@@ -9,8 +9,8 @@ sgraphene4:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -54,7 +54,7 @@ sgraphene4:
        38: graphene-142
        39: graphene-143
        40: graphene-144
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgriffon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon1.yaml
@@ -9,8 +9,8 @@ sgriffon1:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -46,7 +46,7 @@ sgriffon1:
        11: griffon-58
        12: griffon-59
        13: griffon-60
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgriffon2.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon2.yaml
@@ -9,8 +9,8 @@ sgriffon2:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -42,7 +42,7 @@ sgriffon2:
        41: griffon-55
        42: griffon-56
        43: griffon-57
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 100000000

--- a/generators/input/sites/nancy/net-links/sgriffon3.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon3.yaml
@@ -9,8 +9,8 @@ sgriffon3:
  routes: {}

  linecards: 
-    0: 
-      naming_pattern: "%PORT%"
+    1: 
+      naming_pattern: "%LINECARD:A%%PORT%"
      kind: node
      rate: 10000000000
      ports: 
@@ -46,7 +46,7 @@ sgriffon3:
        42: griffon-90
        43: griffon-91
        44: griffon-92
-    1: 
+    2: 
      naming_pattern: "%LINECARD:A%%PORT%"
      kind: router
      rate: 10000000000

--- a/generators/input/sites/nancy/net-links/stalc1.yaml
+++ b/generators/input/sites/nancy/net-links/stalc1.yaml
@@ -59,7 +59,7 @@ stalc1:
        2: stalc3
    2: 
      naming_pattern: "T%LINECARD%/%PORT%"
-      kind: switch
+      kind: router
      rate: 10000000000
      ports: 
        1: sgravillon1