Update MWC configs
Change-Id: I1e70585f7850fa68289ea06cf9d3210e7d10e03b
diff --git a/p4-pod-configs/dev-pod/cavium-spine2.json b/p4-pod-configs/dev-pod/cavium-spine2.json
index e2a7daa..907a1b9 100644
--- a/p4-pod-configs/dev-pod/cavium-spine2.json
+++ b/p4-pod-configs/dev-pod/cavium-spine2.json
@@ -10,22 +10,22 @@
}
},
"piPipeconf": {
- "piPipeconfId": "org.onosproject.pipelines.fabric.bmv2"
+ "piPipeconfId": "org.onosproject.pipelines.fabric"
},
"ports": {
- "1": {
+ "9": {
"name": "s227-eth1",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 9,
"removed": false,
"type": "copper"
},
- "2": {
+ "10": {
"name": "s227-eth2",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 10,
"removed": false,
"type": "copper"
}
diff --git a/p4-pod-configs/mwc-pod/cavium-spine1.json b/p4-pod-configs/mwc-pod/cavium-spine1.json
index c8943fa..0749d84 100644
--- a/p4-pod-configs/mwc-pod/cavium-spine1.json
+++ b/p4-pod-configs/mwc-pod/cavium-spine1.json
@@ -14,19 +14,19 @@
"piPipeconfId": "org.onosproject.pipelines.fabric"
},
"ports": {
- "1": {
- "name": "s226-eth1",
+ "9": {
+ "name": "9",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 9,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s226-eth2",
+ "10": {
+ "name": "10",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 10,
"removed": false,
"type": "copper"
}
diff --git a/p4-pod-configs/mwc-pod/cavium-spine2.json b/p4-pod-configs/mwc-pod/cavium-spine2.json
index 889c4b5..1e44743 100644
--- a/p4-pod-configs/mwc-pod/cavium-spine2.json
+++ b/p4-pod-configs/mwc-pod/cavium-spine2.json
@@ -14,19 +14,19 @@
"piPipeconfId": "org.onosproject.pipelines.fabric.bmv2"
},
"ports": {
- "1": {
- "name": "s227-eth1",
+ "9": {
+ "name": "9",
"speed": 100000,
"enabled": true,
- "number": 1,
+ "number": 9,
"removed": false,
"type": "copper"
},
- "2": {
- "name": "s227-eth2",
+ "10": {
+ "name": "10",
"speed": 100000,
"enabled": true,
- "number": 2,
+ "number": 10,
"removed": false,
"type": "copper"
}
diff --git a/p4-pod-configs/mwc-pod/mellanox-spine2.json b/p4-pod-configs/mwc-pod/mellanox-spine2.json
new file mode 100644
index 0000000..c96f1fd
--- /dev/null
+++ b/p4-pod-configs/mwc-pod/mellanox-spine2.json
@@ -0,0 +1,39 @@
+{
+ "devices": {
+ "device:mellanox:spine2": {
+ "generalprovider": {
+ "p4runtime": {
+ "ip": "10.128.13.103",
+ "deviceKeyId": "p4runtime:device:mellanox:spine2",
+ "port": 50051,
+ "deviceId": 0
+ }
+ },
+ "piPipeconf": {
+ "piPipeconfId": "org.onosproject.pipelines.fabric"
+ },
+ "ports": {
+ "1/0": {
+ "name": "1/0",
+ "speed": 100000,
+ "enabled": true,
+ "number": 1,
+ "removed": false,
+ "type": "copper"
+ },
+ "2/0": {
+ "name": "2/0",
+ "speed": 100000,
+ "enabled": true,
+ "number": 2,
+ "removed": false,
+ "type": "copper"
+ }
+ },
+ "basic": {
+ "driver": "mellanox-pro",
+ "name": "spine2"
+ }
+ }
+ }
+}
diff --git a/p4-pod-configs/mwc-pod/mwc-demo.json b/p4-pod-configs/mwc-pod/mwc-demo.json
index 88ee7d5..56aecde 100644
--- a/p4-pod-configs/mwc-pod/mwc-demo.json
+++ b/p4-pod-configs/mwc-pod/mwc-demo.json
@@ -53,38 +53,9 @@
"device:tofino:leaf1/144": {
"interfaces": [
{
- "name": "leaf1-3/0",
+ "name": "compute-1",
"ips": [
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/145": {
- "interfaces": [
- {
- "name": "leaf1-3/1",
- "ips": [
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/146": {
- "interfaces": [
- {
- "name": "leaf1-3/2",
- "ips": [
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/147": {
- "interfaces": [
- {
- "name": "leaf1-3/3",
- "ips": [
+ "10.6.2.254/24"
],
"vlan-untagged": 10
}
@@ -93,8 +64,10 @@
"device:tofino:leaf2/144": {
"interfaces": [
{
- "name": "leaf2-3/0",
+ "name": "leaf2-3/1",
"ips": [
+ "119.0.0.1/24",
+ "118.0.0.1/24"
],
"vlan-untagged": 20
}
@@ -105,29 +78,9 @@
{
"name": "leaf2-3/1",
"ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/146": {
- "interfaces": [
- {
- "name": "leaf2-3/2",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/147": {
- "interfaces": [
- {
- "name": "leaf2-3/3",
- "ips": [
- "10.6.1.254/24"
+ "10.6.1.254/24",
+ "119.0.0.1/24",
+ "118.0.0.1/24"
],
"vlan-untagged": 20
}
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
index a9d2923..233ddaa 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
@@ -31,36 +31,12 @@
"type": "copper"
},
"3/0": {
- "name": "4/0",
+ "name": "3/0",
"speed": 10000,
"enabled": true,
"number": 144,
"removed": false,
"type": "copper"
- },
- "3/1": {
- "name": "3/1",
- "speed": 10000,
- "enabled": true,
- "number": 145,
- "removed": false,
- "type": "copper"
- },
- "3/2": {
- "name": "3/2",
- "speed": 10000,
- "enabled": true,
- "number": 146,
- "removed": false,
- "type": "copper"
- },
- "3/3": {
- "name": "3/3",
- "speed": 10000,
- "enabled": true,
- "number": 147,
- "removed": false,
- "type": "copper"
}
},
"basic": {
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
index 4f09e43..75acefb 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
@@ -31,7 +31,7 @@
"type": "copper"
},
"3/0": {
- "name": "4/0",
+ "name": "3/0",
"speed": 10000,
"enabled": true,
"number": 144,
@@ -45,22 +45,6 @@
"number": 145,
"removed": false,
"type": "copper"
- },
- "3/2": {
- "name": "3/2",
- "speed": 10000,
- "enabled": true,
- "number": 146,
- "removed": false,
- "type": "copper"
- },
- "3/3": {
- "name": "3/3",
- "speed": 10000,
- "enabled": true,
- "number": 147,
- "removed": false,
- "type": "copper"
}
},
"basic": {