diff --git a/Rakefile b/Rakefile
index 22d9278c9fcf4cb4a38b1ea29a7fbef5848b190d..f72de9e1a3f6765b6db049249aa27085cd6385f7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -200,11 +200,11 @@ namespace :netlinks do
desc "Generates network API JSON files based on net-links yaml files.\nUse DRY=yes to simulate the execution. "
task :generate => [:environment,:hosts] do
host,site = @host.scan(/(\S+)\.(\S+)/).flatten
- root_dir_input = "#{ROOT_DIR}/generators/input/sites"
+ root_dir_input = File.join(ROOT_DIR, "generators","input")
command = File.join(ROOT_DIR, "generators", "grid5000")
command += " " + File.join(root_dir_input, "net-links.rb")
- command += " " + File.join(root_dir_input, site,"#{site}.rb")
- command += " " + File.join(root_dir_input, site,"net-links","#{host}.yaml")
+ command += " " + File.join(root_dir_input,"sites", site,"#{site}.rb")
+ command += " " + File.join(root_dir_input,"sites", site,"net-links","#{host}.yaml")
command << " -s" if ENV['DRY'] == "yes"
# puts command
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
deleted file mode 100644
index 76a6f361068439cd3e2fb62ac0dd6b6b5cc9a727..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "channels": {
- "naming_pattern": "Po%CHANNELID%"
- },
- "kind": "router",
- "linecards": [
- {
-
- },
- {
- "kind": "switch",
- "naming_pattern": "%LINECARD:A%%PORT%",
- "ports": [
- {
-
- },
- {
-
- },
- {
-
- },
- {
- "uid": "sgraphene3"
- },
- {
- "uid": "sgriffon2"
- }
- ],
- "rate": 10000
- },
- {
- "kind": "switch",
- "naming_pattern": "%LINECARD:A%%PORT%",
- "ports": [
- {
-
- },
- {
- "uid": "sgraphene1"
- },
- {
- "uid": "sgraphene2"
- },
- {
-
- },
- {
- "uid": "sgraphene4"
- }
- ],
- "rate": 10000
- },
- {
- "kind": "switch",
- "naming_pattern": "%LINECARD:A%%PORT%",
- "ports": [
- {
-
- },
- {
-
- },
- {
-
- },
- {
- "uid": "sgriffon3"
- },
- {
- "uid": "sgriffon1"
- }
- ],
- "rate": 10000
- }
- ],
- "model": "HP Procurve 5406zl",
- "routes": {
-
- },
- "site": "nancy",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "gw",
- "vlans": {
- "naming_pattern": "Vlan%VLANID%"
- }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
index 6db899106a8d2c2a247f423a799c70ae2d7aef12..c2a06b5c434ba372f304d9bd30c4ebde54c802fc 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
@@ -132,7 +132,7 @@
"uid": "graphene-39"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -145,10 +145,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
index 7e8f4be18a88e9cf60fed808a24e09a82b1192c3..f37b7fcd4003b097ea08e1f3ab20ce3e91fbb15d 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
@@ -117,7 +117,7 @@
"uid": "graphene-74"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -130,10 +130,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
index 971affa611206be03232bbccade21c43605fea41..315c3160a11bd6cbc63f8b154f4653f64dd45d62 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -102,7 +102,7 @@
"uid": "graphene-103"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -115,10 +115,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
index 631d35d424286feb6de55449fecc42bd8aadfff2..980cee49eac27deca7a0594355909bbc6fb3276e 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
@@ -132,7 +132,7 @@
"uid": "graphene-144"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -142,10 +142,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
new file mode 100644
index 0000000000000000000000000000000000000000..36469e4c1c94e1a8bcc977667c1e1161eb8beb20
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
@@ -0,0 +1,204 @@
+{
+ "channels": {
+ "naming_pattern": "Po%CHANNELID%"
+ },
+ "kind": "router",
+ "linecards": [
+ {
+
+ },
+ {
+ "kind": "other",
+ "naming_pattern": "%LINECARD:A%%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "kind": "other",
+ "uid": "sgrapheneib"
+ },
+ {
+ "port": "bmc",
+ "uid": "fgriffon2"
+ },
+ {
+ "uid": "TALC-adm"
+ },
+ {
+ "kind": "switch",
+ "uid": "stalc1"
+ },
+ {
+
+ },
+ {
+ "uid": "sgriffonib"
+ },
+ {
+ "uid": "grimoire"
+ },
+ {
+ "port": "eth0",
+ "uid": "grog"
+ },
+ {
+ "port": "eth1",
+ "uid": "grog"
+ },
+ {
+ "port": "bmc",
+ "uid": "fgriffon1"
+ },
+ {
+ "port": "eth0",
+ "uid": "fgriffon1"
+ },
+ {
+
+ },
+ {
+ "uid": "sgraphene1-ipmi"
+ },
+ {
+ "uid": "sgraphene2-ipmi"
+ },
+ {
+ "uid": "sgraphene3-ipmi"
+ },
+ {
+ "uid": "sgraphene4-ipmi"
+ },
+ {
+
+ },
+ {
+ "uid": "loria"
+ },
+ {
+ "uid": "sgriffon2-ipmi"
+ },
+ {
+ "uid": "sgriffon1-ipmi"
+ },
+ {
+ "uid": "sgriffon3-ipmi"
+ },
+ {
+ "port": "eth0",
+ "uid": "fgrelon1"
+ },
+ {
+ "port": "eth1",
+ "uid": "fgriffon1"
+ },
+ {
+ "port": "eth1",
+ "uid": "fgrelon1"
+ }
+ ],
+ "rate": 1000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "%LINECARD:A%%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "sgraphene3"
+ },
+ {
+ "uid": "sgriffon2"
+ }
+ ],
+ "rate": 1000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "%LINECARD:A%%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "sgraphene1"
+ },
+ {
+ "uid": "sgraphene2"
+ },
+ {
+
+ },
+ {
+ "uid": "sgraphene4"
+ }
+ ],
+ "rate": 1000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "%LINECARD:A%%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "kind": "other",
+ "uid": "fgriffon1"
+ },
+ {
+ "kind": "other",
+ "uid": "fgriffon2"
+ },
+ {
+ "uid": "sgriffon3"
+ },
+ {
+ "uid": "sgriffon1"
+ }
+ ],
+ "rate": 1000000000
+ },
+ {
+ "kind": "virtual",
+ "naming_pattern": "%LINECARD:A%%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "renater-nancy"
+ }
+ ],
+ "rate": 10000000000
+ }
+ ],
+ "model": "HP Procurve 5406zl",
+ "routes": {
+
+ },
+ "site": "nancy",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sgravillon1",
+ "vlans": {
+ "naming_pattern": "Vlan%VLANID%"
+ }
+}
\ 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 1419dbc5aaaf846db07795087996623916c41684..cabd0893c0bdd6177ebf005fe7ede19642cdecc5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -141,7 +141,7 @@
"uid": "griffon-29"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -154,10 +154,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
index e3b80cffa7c7c4a2dec95ba3a99bd331a182e52e..f7a89b3b1e770f3418c793f08ae4aeda1b950015 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
@@ -141,7 +141,7 @@
"uid": "griffon-57"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -151,10 +151,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 100000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
index 54a8ee41a396942420fe578e562b0c1e44fa150c..a4a5a2f944afb5c1b8975af5dde99a32a6b15e3d 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
@@ -144,7 +144,7 @@
"uid": "griffon-92"
}
],
- "rate": 1000
+ "rate": 10000000000
},
{
"kind": "router",
@@ -154,10 +154,10 @@
},
{
- "uid": "gw"
+ "uid": "sgravillon1"
}
],
- "rate": 10000
+ "rate": 10000000000
}
],
"model": "3com 4500g",
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json
index 479cbcb1df3c7f03ea86b87b9e0b75090cc65c52..66897f72b52f5e371d9926998540316cdcd45e71 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -6,7 +6,7 @@
"linecards": [
{
"kind": "node",
- "naming_pattern": "%PORT%",
+ "naming_pattern": "T%LINECARD%/%PORT%",
"ports": [
{
@@ -141,7 +141,41 @@
"uid": "talc-37"
}
],
- "rate": 1000
+ "rate": 1000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "stalc3"
+ }
+ ],
+ "rate": 10000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "sgravillon1"
+ },
+ {
+ "kind": "other",
+ "rate": 10000000000,
+ "uid": "talc-srv"
+ }
+ ],
+ "rate": 10000000000
}
],
"model": "hp procurve",
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc2.json b/data/grid5000/sites/nancy/network_equipments/stalc2.json
index 6c1c8849dc008f5285b8661b74ef0eae48e48867..392806ee1d82506ee3cca22c9a4761dea2b75c5f 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc2.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc2.json
@@ -6,7 +6,7 @@
"linecards": [
{
"kind": "node",
- "naming_pattern": "%PORT%",
+ "naming_pattern": "G%LINECARD%/%PORT%",
"ports": [
{
@@ -138,7 +138,39 @@
"uid": "talc-67"
}
],
- "rate": 1000
+ "rate": 10000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "stalc4"
+ }
+ ],
+ "rate": 10000000000
+ },
+ {
+ "kind": "other",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "talc1"
+ },
+ {
+ "uid": "talc2"
+ }
+ ],
+ "rate": 10000000000
}
],
"model": "hp procurve",
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc3.json b/data/grid5000/sites/nancy/network_equipments/stalc3.json
index 9fd590c9fb1366a1dd53739ed93d37a59e433cc9..5c019aec6a3c5bb181c9559e9e00cd2e7ec0a029 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc3.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc3.json
@@ -6,7 +6,7 @@
"linecards": [
{
"kind": "node",
- "naming_pattern": "%PORT%",
+ "naming_pattern": "G%LINECARD%/%PORT%",
"ports": [
{
@@ -138,7 +138,23 @@
"uid": "talc-133"
}
],
- "rate": 1000
+ "rate": 10000000000
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "stalc1"
+ },
+ {
+ "uid": "stalc4"
+ }
+ ],
+ "rate": 10000000000
}
],
"model": "hp procurve",
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc4.json b/data/grid5000/sites/nancy/network_equipments/stalc4.json
new file mode 100644
index 0000000000000000000000000000000000000000..612653155615ed24d736dfb20b72f164dbe937f6
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/stalc4.json
@@ -0,0 +1,38 @@
+{
+ "channels": {
+ "naming_pattern": "Po%CHANNELID%"
+ },
+ "kind": "switch",
+ "linecards": [
+ {
+
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "T%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "stalc3"
+ },
+ {
+ "uid": "stalc2"
+ }
+ ],
+ "rate": 10000000000
+ }
+ ],
+ "model": "hp procurve",
+ "routes": {
+
+ },
+ "site": "nancy",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "stalc4",
+ "vlans": {
+ "naming_pattern": "Vlan%VLANID%"
+ }
+}
\ No newline at end of file
diff --git a/generators/input/net-links.rb b/generators/input/net-links.rb
index f76ba056763fc6dbde7c940a80d5ad23717347b5..599c86008c3d459c045b642ccacfd462f7bbdddc 100644
--- a/generators/input/net-links.rb
+++ b/generators/input/net-links.rb
@@ -9,7 +9,7 @@
# Most properties are directly written as they are from the net-links YAML file to the the JSON file
model properties["model"]
kind properties["kind"]
-# @context.recursive_merge!(:site => site)
+ @context.recursive_merge!(:site => site)
snmp_community properties["snmp_community"]
vlans properties["vlans"]
routes properties["routes"]
diff --git a/generators/input/sites/nancy/net-links/sgraphene1.yaml b/generators/input/sites/nancy/net-links/sgraphene1.yaml
index 87fbc0d4af6264241366c02438039b9f553e94b2..e705554ba1335c8404204486735fe16764490d74 100644
--- a/generators/input/sites/nancy/net-links/sgraphene1.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene1.yaml
@@ -12,7 +12,7 @@ sgraphene1:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: graphene-1
1: graphene-2
diff --git a/generators/input/sites/nancy/net-links/sgraphene2.yaml b/generators/input/sites/nancy/net-links/sgraphene2.yaml
index a094ee19ad8a23d8a28e3c79908c16cdb60d177b..49db597a4c8accc3d0d7a817cade5f1ba612b558 100644
--- a/generators/input/sites/nancy/net-links/sgraphene2.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene2.yaml
@@ -12,7 +12,7 @@ sgraphene2:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: graphene-41
1: graphene-40
diff --git a/generators/input/sites/nancy/net-links/sgraphene3.yaml b/generators/input/sites/nancy/net-links/sgraphene3.yaml
index 1ae3b1d3105f40b4e9fa0a411f44fde4c35bbadd..c3ed074fd3b165066c578fb47da514ad7af6b047 100644
--- a/generators/input/sites/nancy/net-links/sgraphene3.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene3.yaml
@@ -12,7 +12,7 @@ sgraphene3:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: graphene-75
1: graphene-76
diff --git a/generators/input/sites/nancy/net-links/sgraphene4.yaml b/generators/input/sites/nancy/net-links/sgraphene4.yaml
index b5e1d89a76ffa352998766006209a4076975d419..e5acfb85bb20fb257d6fb1738e9208357455c0f5 100644
--- a/generators/input/sites/nancy/net-links/sgraphene4.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene4.yaml
@@ -12,7 +12,7 @@ sgraphene4:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: graphene-106
1: graphene-105
diff --git a/generators/input/sites/nancy/net-links/sgravillon1.yaml b/generators/input/sites/nancy/net-links/sgravillon1.yaml
index bd9204851eba97671ded2e1cea4e9e3b101a8f5e..bbc8aadc059639bb4a94eaa739d9461aba01559b 100644
--- a/generators/input/sites/nancy/net-links/sgravillon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgravillon1.yaml
@@ -12,7 +12,7 @@ sgravillon1:
1:
naming_pattern: "%LINECARD:A%%PORT%"
kind: other
- rate: 100000000
+ rate: 1000000000
ports:
1:
kind: other
@@ -23,7 +23,8 @@ sgravillon1:
3:
uid: TALC-adm
4:
- uid: TALC-prod
+ kind: switch
+ uid: stalc1
6:
uid: sgriffonib
7: grimoire
@@ -67,14 +68,14 @@ sgravillon1:
2:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
- rate: 100000000
+ rate: 1000000000
ports:
- 3: sgriffon3
- 4: sgriffon1
+ 3: sgraphene3
+ 4: sgriffon2
3:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
- rate: 100000000
+ rate: 1000000000
ports:
1: sgraphene1
2: sgraphene2
@@ -82,7 +83,7 @@ sgravillon1:
4:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
- rate: 100000000
+ rate: 1000000000
ports:
1:
kind: other
@@ -97,7 +98,7 @@ sgravillon1:
5:
naming_pattern: "%LINECARD:A%%PORT%"
kind: virtual
- rate: 100000000
+ rate: 10000000000
ports:
4: renater-nancy
channels:
diff --git a/generators/input/sites/nancy/net-links/sgriffon1.yaml b/generators/input/sites/nancy/net-links/sgriffon1.yaml
index becefa7b0c202aaf61040dbf7460b120ade7e62d..4e0018e836ded951a1d2568a17e4f8f6dc58a3c7 100644
--- a/generators/input/sites/nancy/net-links/sgriffon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon1.yaml
@@ -12,7 +12,7 @@ sgriffon1:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: griffon-2
1: griffon-1
diff --git a/generators/input/sites/nancy/net-links/sgriffon2.yaml b/generators/input/sites/nancy/net-links/sgriffon2.yaml
index 2f13d8982cec7a86001868bdd7e71493cf090963..26ab785f7663338dc2f021bdfe6e3347e69bb64b 100644
--- a/generators/input/sites/nancy/net-links/sgriffon2.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon2.yaml
@@ -12,7 +12,7 @@ sgriffon2:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: griffon-31
1: griffon-30
diff --git a/generators/input/sites/nancy/net-links/sgriffon3.yaml b/generators/input/sites/nancy/net-links/sgriffon3.yaml
index a7b69fd10a73286927c3e609b5d5cd0d8d22cc00..428583b4b4015ff0e90c2f4b2ae27bac326e9425 100644
--- a/generators/input/sites/nancy/net-links/sgriffon3.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon3.yaml
@@ -12,7 +12,7 @@ sgriffon3:
0:
naming_pattern: "%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
4: griffon-61
5: griffon-62
@@ -49,7 +49,7 @@ sgriffon3:
1:
naming_pattern: "%LINECARD:A%%PORT%"
kind: router
- rate: 100000000
+ rate: 10000000000
ports:
1: sgravillon1
channels:
diff --git a/generators/input/sites/nancy/net-links/stalc1.yaml b/generators/input/sites/nancy/net-links/stalc1.yaml
index 30b3ec736b59c00442363d0f1beea906ba43bb2a..3583613b4171e424e2c993256bd0c5fd5c85cca2 100644
--- a/generators/input/sites/nancy/net-links/stalc1.yaml
+++ b/generators/input/sites/nancy/net-links/stalc1.yaml
@@ -8,14 +8,14 @@ stalc1:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
-
0:
- naming_pattern: "%PORT%"
+ naming_pattern: "T%LINECARD%/%PORT%"
kind: node
- rate: 10000000
+ rate: 1000000000
ports:
1: talc-1
3: talc-2
+ 5: talc-134
6: talc-3
7: talc-4
8: talc-5
@@ -51,6 +51,22 @@ stalc1:
41: talc-35
42: talc-36
43: talc-37
- 5: talc-134
+ 1:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 2: stalc3
+ 2:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 1: sgravillon1
+ 2:
+ kind: other
+ rate: 10000000000
+ uid: talc-srv
channels:
naming_pattern: Po%CHANNELID%
+
diff --git a/generators/input/sites/nancy/net-links/stalc2.yaml b/generators/input/sites/nancy/net-links/stalc2.yaml
index 21cd6db6c08a0b0f8118f587e70d81b5f164f63d..9659dd595d95d4667c1ed3692167c541812d6373 100644
--- a/generators/input/sites/nancy/net-links/stalc2.yaml
+++ b/generators/input/sites/nancy/net-links/stalc2.yaml
@@ -10,9 +10,9 @@ stalc2:
linecards:
0:
- naming_pattern: "%PORT%"
+ naming_pattern: "G%LINECARD%/%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
3: talc-38
4: talc-39
@@ -44,5 +44,18 @@ stalc2:
40: talc-65
41: talc-66
42: talc-67
+ 1:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 2: stalc4
+ 2:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: other
+ rate: 10000000000
+ ports:
+ 1: talc1
+ 2: talc2
channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc3.yaml b/generators/input/sites/nancy/net-links/stalc3.yaml
index 4f3bc09455a522f4d36f90bde126f233f3890fdb..06009e262597cf56ae51dd75f6711d590b851620 100644
--- a/generators/input/sites/nancy/net-links/stalc3.yaml
+++ b/generators/input/sites/nancy/net-links/stalc3.yaml
@@ -10,9 +10,9 @@ stalc3:
linecards:
0:
- naming_pattern: "%PORT%"
+ naming_pattern: "G%LINECARD%/%PORT%"
kind: node
- rate: 10000000
+ rate: 10000000000
ports:
2: talc-69
1: talc-68
@@ -52,5 +52,12 @@ stalc3:
40: talc-103
41: talc-104
42: talc-133
+ 1:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 1: stalc1
+ 2: stalc4
channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc4.yaml b/generators/input/sites/nancy/net-links/stalc4.yaml
index 743acf44cff9a7754963c9eefdba236700845bda..a9ebb3d6d126979ba41dbf6d63eb57bdbf7a4a48 100644
--- a/generators/input/sites/nancy/net-links/stalc4.yaml
+++ b/generators/input/sites/nancy/net-links/stalc4.yaml
@@ -9,11 +9,12 @@ stalc4:
routes: {}
linecards:
- 0:
- naming_pattern: "%PORT%"
- kind: node
- rate: 10000000
- ports: {}
-
+ 1:
+ naming_pattern: "T%LINECARD%/%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 1: stalc3
+ 2: stalc2
channels:
naming_pattern: Po%CHANNELID%