Update MWC config
Change-Id: I34bba025a862741f6210397c47777b3b7124ef7a
diff --git a/p4-pod-configs/mwc-pod/mwc-demo-two-cavium.json b/p4-pod-configs/mwc-pod/mwc-demo-two-cavium.json
deleted file mode 100644
index 5db7aee..0000000
--- a/p4-pod-configs/mwc-pod/mwc-demo-two-cavium.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "devices": {
- "device:tofino:leaf1": {
- "segmentrouting": {
- "name": "leaf1",
- "ipv4NodeSid": 204,
- "ipv4Loopback": "192.168.0.204",
- "ipv6NodeSid": 214,
- "ipv6Loopback": "2000::c0a8:0204",
- "routerMac": "00:00:00:00:02:04",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:tofino:leaf2": {
- "segmentrouting": {
- "name": "leaf2",
- "ipv4NodeSid": 205,
- "ipv4Loopback": "192.168.0.205",
- "ipv6NodeSid": 215,
- "ipv6Loopback": "2000::c0a8:0205",
- "routerMac": "00:00:00:00:02:05",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:cavium:spine1": {
- "segmentrouting": {
- "name": "spine1",
- "ipv4NodeSid": 226,
- "ipv4Loopback": "192.168.0.226",
- "ipv6NodeSid": 236,
- "ipv6Loopback": "2000::c0a8:0226",
- "routerMac": "00:00:00:00:02:26",
- "isEdgeRouter": false,
- "adjacencySids": []
- }
- },
- "device:cavium:spine2": {
- "segmentrouting": {
- "name": "spine2",
- "ipv4NodeSid": 227,
- "ipv4Loopback": "192.168.0.227",
- "ipv6NodeSid": 237,
- "ipv6Loopback": "2000::c0a8:0227",
- "routerMac": "00:00:00:00:02:27",
- "isEdgeRouter": false,
- "adjacencySids": []
- }
- }
- },
- "ports": {
- "device:tofino:leaf1/144": {
- "interfaces": [
- {
- "name": "leaf1-3/0",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/145": {
- "interfaces": [
- {
- "name": "leaf1-3/1",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/146": {
- "interfaces": [
- {
- "name": "leaf1-3/2",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/147": {
- "interfaces": [
- {
- "name": "leaf1-3/3",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf2/144": {
- "interfaces": [
- {
- "name": "leaf2-3/0",
- "ips": [
- "10.6.2.254/24",
- "118.0.0.1/24",
- "119.0.0.1/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/145": {
- "interfaces": [
- {
- "name": "leaf2-3/1",
- "ips": [
- "10.6.2.254/24",
- "118.0.0.1/24",
- "119.0.0.1/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/146": {
- "interfaces": [
- {
- "name": "leaf2-3/2",
- "ips": [
- "10.6.2.254/24",
- "118.0.0.1/24",
- "119.0.0.1/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/147": {
- "interfaces": [
- {
- "name": "leaf2-3/3",
- "ips": [
- "10.6.2.254/24",
- "118.0.0.1/24",
- "119.0.0.1/24"
- ],
- "vlan-untagged": 20
- }
- ]
- }
- }
-}
diff --git a/p4-pod-configs/mwc-pod/mwc-demo.json b/p4-pod-configs/mwc-pod/mwc-demo.json
index caf0a51..c8e0386 100644
--- a/p4-pod-configs/mwc-pod/mwc-demo.json
+++ b/p4-pod-configs/mwc-pod/mwc-demo.json
@@ -53,9 +53,23 @@
"device:tofino:leaf1/144": {
"interfaces": [
{
- "name": "leaf1-3/0",
+ "name": "leaf1-3/0-compute-1",
"ips": [
- "10.6.2.254/24"
+ "10.6.1.254/24",
+ "118.0.0.254/24",
+ "119.0.0.254/24"
+ ],
+ "vlan-untagged": 10
+ }
+ ]
+ },
+ "device:tofino:leaf1/145": {
+ "interfaces": [
+ {
+ "name": "leaf1-3/1------mgmt-25-----enb",
+ "ips": [
+ "118.0.0.254/24",
+ "119.0.0.254/24"
],
"vlan-untagged": 10
}
@@ -64,10 +78,9 @@
"device:tofino:leaf2/144": {
"interfaces": [
{
- "name": "leaf2-3/1",
+ "name": "leaf2-3/0-compute-2",
"ips": [
- "118.0.0.1/24",
- "119.0.0.1/24"
+ "10.6.2.254/24"
],
"vlan-untagged": 20
}
@@ -76,13 +89,22 @@
"device:tofino:leaf2/145": {
"interfaces": [
{
- "name": "leaf2-3/1",
+ "name": "leaf2-3/1-------mgmt-26---enb",
"ips": [
- "10.6.1.254/24",
- "118.0.0.1/24",
- "119.0.0.1/24"
+ "140.0.0.2/24"
],
- "vlan-untagged": 20
+ "vlan-untagged": 140
+ }
+ ]
+ },
+ "device:tofino:leaf2/146": {
+ "interfaces": [
+ {
+ "name": "leaf2-3/2-------mgmt-27---ARM",
+ "ips": [
+ "150.0.0.254/254"
+ ],
+ "vlan-untagged": 150
}
]
}
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
index 233ddaa..39a771e 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
@@ -4,7 +4,7 @@
"chassisId": "000000000204",
"generalprovider": {
"p4runtime": {
- "ip": "10.6.0.221",
+ "ip": "10.128.13.221",
"deviceKeyId": "p4runtime:device:tofino:leaf1",
"port": 50051,
"deviceId": 0
@@ -37,6 +37,14 @@
"number": 144,
"removed": false,
"type": "copper"
+ },
+ "3/1": {
+ "name": "3/1",
+ "speed": 10000,
+ "enabled": true,
+ "number": 145,
+ "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 75acefb..7c767d5 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
@@ -4,7 +4,7 @@
"chassisId": "000000000205",
"generalprovider": {
"p4runtime": {
- "ip": "10.6.0.222",
+ "ip": "10.128.13.222",
"deviceKeyId": "p4runtime:device:tofino:leaf2",
"port": 50051,
"deviceId": 0
@@ -45,6 +45,14 @@
"number": 145,
"removed": false,
"type": "copper"
+ },
+ "3/2": {
+ "name": "3/2",
+ "speed": 10000,
+ "enabled": true,
+ "number": 146,
+ "removed": false,
+ "type": "copper"
}
},
"basic": {