Fix port numbers and pipeconf of netcfg
Change-Id: I6e38aeb93ee385a3da38c65edcc7ec566e75cb21
diff --git a/tools/test/topos/tofino-demo.json b/tools/test/topos/tofino-demo.json
index 8c4684d..31da9b6 100644
--- a/tools/test/topos/tofino-demo.json
+++ b/tools/test/topos/tofino-demo.json
@@ -10,22 +10,22 @@
}
},
"piPipeconf": {
- "piPipeconfId": "pi-demo-ecmp"
+ "piPipeconfId": "tofino-default-montara-pipeconf"
},
"ports": {
- "1": {
- "name": "s21-1",
+ "1/0": {
+ "name": "1/0",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 128,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s21-2",
+ "2/0": {
+ "name": "2/0",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 136,
"removed": false,
"type": "copper"
}
@@ -47,22 +47,22 @@
}
},
"piPipeconf": {
- "piPipeconfId": "pi-demo-ecmp"
+ "piPipeconfId": "tofino-default-montara-pipeconf"
},
"ports": {
- "1": {
- "name": "s22-1",
+ "1/0": {
+ "name": "1/0",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 128,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s22-2",
+ "2/0": {
+ "name": "2/0",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 136,
"removed": false,
"type": "copper"
}
@@ -84,30 +84,30 @@
}
},
"piPipeconf": {
- "piPipeconfId": "pi-demo-ecmp"
+ "piPipeconfId": "tofino-default-mavericks-pipeconf"
},
"ports": {
- "1": {
- "name": "s11-1",
+ "1/0": {
+ "name": "1/0",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 188,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s11-2",
+ "2/0": {
+ "name": "2/0",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 184,
"removed": false,
"type": "copper"
},
- "3": {
- "name": "s11-3",
+ "3/0": {
+ "name": "3/0",
"speed": 40000,
"enabled": true,
- "number": 3,
+ "number": 180,
"removed": false,
"type": "copper"
}
@@ -129,30 +129,30 @@
}
},
"piPipeconf": {
- "piPipeconfId": "pi-demo-ecmp"
+ "piPipeconfId": "tofino-default-mavericks-pipeconf"
},
"ports": {
- "1": {
- "name": "s12-1",
+ "1/0": {
+ "name": "1/0",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 188,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s12-2",
+ "2/0": {
+ "name": "2/0",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 184,
"removed": false,
"type": "copper"
},
- "3": {
- "name": "s12-3",
+ "3/0": {
+ "name": "3/0",
"speed": 40000,
"enabled": true,
- "number": 3,
+ "number": 180,
"removed": false,
"type": "copper"
}
@@ -166,49 +166,49 @@
}
},
"links": {
- "device:tofino:11/1-device:tofino:21/1": {
+ "device:tofino:11/188-device:tofino:21/128": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:11/2-device:tofino:22/1": {
+ "device:tofino:11/184-device:tofino:22/128": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:12/1-device:tofino:21/2": {
+ "device:tofino:12/188-device:tofino:21/136": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:12/2-device:tofino:22/2": {
+ "device:tofino:12/184-device:tofino:22/136": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:21/1-device:tofino:11/1": {
+ "device:tofino:21/128-device:tofino:11/188": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:22/1-device:tofino:11/2": {
+ "device:tofino:22/128-device:tofino:11/184": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:21/2-device:tofino:12/1": {
+ "device:tofino:21/136-device:tofino:12/188": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
}
},
- "device:tofino:22/2-device:tofino:12/2": {
+ "device:tofino:22/136-device:tofino:12/184": {
"basic": {
"bandwidth": 100000,
"type": "DIRECT"
@@ -223,7 +223,7 @@
"10.0.0.1"
],
"locations": [
- "device:tofino:21/3"
+ "device:tofino:11/180"
],
"longitude": -107,
"name": "h1"
@@ -236,7 +236,7 @@
"10.0.0.2"
],
"locations": [
- "device:tofino:22/3"
+ "device:tofino:12/180"
],
"longitude": -99,
"name": "h2"