Working configs for ONS demo
Change-Id: Ib1f5b0a1b52515079044aedf44a56f2be48a15ca
diff --git a/mwc-provision-cavium-test.sh b/mwc-provision-cavium-test.sh
new file mode 100755
index 0000000..7efc631
--- /dev/null
+++ b/mwc-provision-cavium-test.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+MWC_HEAD_IP="10.128.13.3"
+ENODEB_ADDR="119.0.0.10"
+UE_SUBNET="17.255.0.0/16"
+
+set -ex
+
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-cavium.json
+sleep 1
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
+sleep 5
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
+sleep 2
+sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
+
diff --git a/mwc-provision-mlx-test.sh b/mwc-provision-mlx-test.sh
index 4cc4cf7..8ed2006 100755
--- a/mwc-provision-mlx-test.sh
+++ b/mwc-provision-mlx-test.sh
@@ -6,8 +6,10 @@
set -ex
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mwc-demo-mlx-test.json
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
+sleep 1
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
sleep 2
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
@@ -16,9 +18,7 @@
sleep 5
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mellanox-spine2.json
sleep 5
-#onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
-#sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
sleep 2
-sshpass -p rocks -t onos@${MWC_HEAD_IP} "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
+sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
diff --git a/mwc-provision.sh b/mwc-provision.sh
index 248d9b9..aff7e7a 100755
--- a/mwc-provision.sh
+++ b/mwc-provision.sh
@@ -6,19 +6,23 @@
set -ex
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mwc-demo.json
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-cavium.json
+sleep 1
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
+sleep 1
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mellanox-spine2.json
+sleep 3
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
+sleep 3
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
sleep 5
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
sleep 5
-#onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mellanox-spine2.json
-#sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
-sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
-sleep 2
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
+sleep 1
sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
diff --git a/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
index 840d33b..f2fa4e9 100644
--- a/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
+++ b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
@@ -1,6 +1,6 @@
{
"ports": {
- "device:tofino:leaf2/172": {
+ "device:tofino:leaf2/160": {
"interfaces": [ ]
},
"device:tofino:leaf2/183": {
diff --git a/p4-pod-configs/mwc-pod/hosts.json b/p4-pod-configs/mwc-pod/hosts.json
index f4deba6..ef9dc64 100644
--- a/p4-pod-configs/mwc-pod/hosts.json
+++ b/p4-pod-configs/mwc-pod/hosts.json
@@ -1,8 +1,8 @@
{
"hosts": {
- "00:1e:67:d2:ee:b2/None": {
+ "00:1E:67:D2:EC:7E/None": {
"basic": {
- "name": "Compute Node 1",
+ "name": "Compute Node 1 (DI)",
"ips": [
"10.6.1.3"
],
@@ -23,7 +23,7 @@
]
}
},
- "00:1e:67:d2:c9:8a/None": {
+ "00:1E:67:D2:C9:8B/None": {
"basic": {
"name": "Compute Node 2",
"ips": [
@@ -78,27 +78,56 @@
]
}
},
- "3c:fd:fe:a6:e7:09/None": {
+ "52:74:B7:2C:04:F1/None": {
"basic": {
- "name": "vUE",
+ "name": "UE simulator (INT sink)",
"ips": [
- "10.6.2.101"
- ],
- "locations": [
- "device:tofino:leaf2/152"
- ]
- }
- },
- "3c:fd:fe:a6:e7:08/None": {
- "basic": {
- "name": "vAppServer",
- "ips": [
- "10.6.2.102"
+ "160.0.2.1",
+ "160.0.2.2",
+ "160.0.2.3",
+ "160.0.2.4",
+ "160.0.2.5",
+ "160.0.2.6",
+ "160.0.2.7",
+ "160.0.2.8",
+ "160.0.2.9",
+ "160.0.2.10"
],
"locations": [
"device:tofino:leaf2/160"
]
}
+ },
+ "52:74:B7:2C:04:F2/None": {
+ "basic": {
+ "name": "Internet simulator (INT source)",
+ "ips": [
+ "160.0.1.1",
+ "160.0.1.2",
+ "160.0.1.3",
+ "160.0.1.4",
+ "160.0.1.5",
+ "160.0.1.6",
+ "160.0.1.7",
+ "160.0.1.8",
+ "160.0.1.9",
+ "160.0.1.10"
+ ],
+ "locations": [
+ "device:tofino:leaf1/160"
+ ]
+ }
+ },
+ "D0:50:99:C0:3B:20/None": {
+ "basic": {
+ "name": "INT report exporter (Netcope)",
+ "ips": [
+ "10.6.1.100"
+ ],
+ "locations": [
+ "device:tofino:leaf1/147"
+ ]
+ }
}
}
}
diff --git a/p4-pod-configs/mwc-pod/mellanox-spine2.json b/p4-pod-configs/mwc-pod/mellanox-spine2.json
index bf03f41..c96f1fd 100644
--- a/p4-pod-configs/mwc-pod/mellanox-spine2.json
+++ b/p4-pod-configs/mwc-pod/mellanox-spine2.json
@@ -13,19 +13,19 @@
"piPipeconfId": "org.onosproject.pipelines.fabric"
},
"ports": {
- "3/0": {
- "name": "3/0",
+ "1/0": {
+ "name": "1/0",
"speed": 100000,
"enabled": true,
- "number": 3,
+ "number": 1,
"removed": false,
"type": "copper"
},
- "4/0": {
- "name": "4/0",
+ "2/0": {
+ "name": "2/0",
"speed": 100000,
"enabled": true,
- "number": 4,
+ "number": 2,
"removed": false,
"type": "copper"
}
diff --git a/p4-pod-configs/mwc-pod/mwc-demo-mlx-test.json b/p4-pod-configs/mwc-pod/mwc-demo-mlx-test.json
deleted file mode 100644
index 882ed68..0000000
--- a/p4-pod-configs/mwc-pod/mwc-demo-mlx-test.json
+++ /dev/null
@@ -1,146 +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:mellanox: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-compute-1",
- "ips": [
- "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-mgmt25-enb",
- "ips": [
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/146": {
- "interfaces": [
- {
- "name": "leaf1-3/2--head-node(ProgRAN)",
- "ips": [
- "118.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf2/144": {
- "interfaces": [
- {
- "name": "leaf2-3/0-compute-2",
- "ips": [
- "10.6.2.254/24",
- "122.0.0.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/145": {
- "interfaces": [
- {
- "name": "leaf2-3/1-P4-DP",
- "ips": [
- "140.0.0.2/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/146": {
- "interfaces": [
- {
- "name": "leaf2-3/2-------mgmt-27---ARM",
- "ips": [
- "150.0.0.254/24"
- ],
- "vlan-untagged": 150
- }
- ]
- },
- "device:tofino:leaf2/152": {
- "interfaces": [
- {
- "name": "leaf2-COMP2-40G-1",
- "ips": [
- "10.6.2.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/160": {
- "interfaces": [
- {
- "name": "leaf2-COMP2-40G-2",
- "ips": [
- "10.6.2.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- }
- }
-}
diff --git a/p4-pod-configs/mwc-pod/mwc-demo.json.bak b/p4-pod-configs/mwc-pod/mwc-demo.json.bak
deleted file mode 100644
index 882ed68..0000000
--- a/p4-pod-configs/mwc-pod/mwc-demo.json.bak
+++ /dev/null
@@ -1,146 +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:mellanox: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-compute-1",
- "ips": [
- "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-mgmt25-enb",
- "ips": [
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/146": {
- "interfaces": [
- {
- "name": "leaf1-3/2--head-node(ProgRAN)",
- "ips": [
- "118.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf2/144": {
- "interfaces": [
- {
- "name": "leaf2-3/0-compute-2",
- "ips": [
- "10.6.2.254/24",
- "122.0.0.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/145": {
- "interfaces": [
- {
- "name": "leaf2-3/1-P4-DP",
- "ips": [
- "140.0.0.2/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/146": {
- "interfaces": [
- {
- "name": "leaf2-3/2-------mgmt-27---ARM",
- "ips": [
- "150.0.0.254/24"
- ],
- "vlan-untagged": 150
- }
- ]
- },
- "device:tofino:leaf2/152": {
- "interfaces": [
- {
- "name": "leaf2-COMP2-40G-1",
- "ips": [
- "10.6.2.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/160": {
- "interfaces": [
- {
- "name": "leaf2-COMP2-40G-2",
- "ips": [
- "10.6.2.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- }
- }
-}
diff --git a/p4-pod-configs/mwc-pod/mwc-demo.json b/p4-pod-configs/mwc-pod/sr-conf-base.json
similarity index 71%
rename from p4-pod-configs/mwc-pod/mwc-demo.json
rename to p4-pod-configs/mwc-pod/sr-conf-base.json
index ed06b4a..8ebdb55 100644
--- a/p4-pod-configs/mwc-pod/mwc-demo.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-base.json
@@ -23,25 +23,13 @@
"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": []
- }
}
},
"ports": {
"device:tofino:leaf1/144": {
"interfaces": [
{
- "name": "leaf1-3/0-compute-1",
+ "name": "leaf1/3/0--compute-1--ens802f0",
"ips": [
"10.6.1.254/24",
"118.0.0.254/24",
@@ -54,7 +42,7 @@
"device:tofino:leaf1/145": {
"interfaces": [
{
- "name": "leaf1-3/1-mgmt25-enb",
+ "name": "leaf1/3/1--mgmt25--enb",
"ips": [
"118.0.0.254/24",
"119.0.0.254/24"
@@ -64,11 +52,14 @@
]
},
"device:tofino:leaf1/146": {
+ "interfaces": [ ]
+ },
+ "device:tofino:leaf1/147": {
"interfaces": [
{
- "name": "leaf1-3/2--head-node(ProgRAN)",
+ "name": "leaf1/3/3--mgmt28--nc-int-exp",
"ips": [
- "118.0.0.254/24"
+ "10.6.1.254/24"
],
"vlan-untagged": 10
}
@@ -77,7 +68,7 @@
"device:tofino:leaf2/144": {
"interfaces": [
{
- "name": "leaf2-3/0-compute-2",
+ "name": "leaf2/3/0--compute-2",
"ips": [
"10.6.2.254/24",
"122.0.0.254/24"
@@ -89,7 +80,7 @@
"device:tofino:leaf2/145": {
"interfaces": [
{
- "name": "leaf2-3/1-P4-DP",
+ "name": "leaf2/3/1--SPGW-DP",
"ips": [
"140.0.0.2/24"
],
@@ -100,7 +91,7 @@
"device:tofino:leaf2/146": {
"interfaces": [
{
- "name": "leaf2-3/2-------mgmt-27---ARM",
+ "name": "leaf2/3/2--mgmt27--ARM",
"ips": [
"150.0.0.254/24"
],
@@ -108,25 +99,28 @@
}
]
},
- "device:tofino:leaf2/152": {
+ "device:tofino:leaf2/147": {
+ "interfaces": [ ]
+ },
+ "device:tofino:leaf1/160": {
"interfaces": [
{
- "name": "leaf2-COMP2-40G-1",
+ "name": "leaf1/5/0--nc1-int-source",
"ips": [
- "10.6.2.254/24"
+ "160.0.1.254/24"
],
- "vlan-untagged": 20
+ "vlan-untagged": 161
}
]
},
"device:tofino:leaf2/160": {
"interfaces": [
{
- "name": "leaf2-COMP2-40G-2",
+ "name": "leaf2/5/0--nc2-int-sink",
"ips": [
- "10.6.2.254/24"
+ "160.0.2.254/24"
],
- "vlan-untagged": 20
+ "vlan-untagged": 162
}
]
}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-cavium.json b/p4-pod-configs/mwc-pod/sr-conf-cavium.json
new file mode 100644
index 0000000..91591a8
--- /dev/null
+++ b/p4-pod-configs/mwc-pod/sr-conf-cavium.json
@@ -0,0 +1,16 @@
+{
+ "devices": {
+ "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": []
+ }
+ }
+ }
+}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json
new file mode 100644
index 0000000..0fb7fe0
--- /dev/null
+++ b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json
@@ -0,0 +1,40 @@
+{
+ "ports": {
+ "device:tofino:leaf2/160": {
+ "interfaces": [ ]
+ },
+ "device:tofino:leaf1/146": {
+ "interfaces": [
+ {
+ "name": "leaf1/3/2--compute-1--ens802f1",
+ "ips": [
+ "160.0.2.254/24"
+ ],
+ "vlan-untagged": 162
+ }
+ ]
+ }
+ },
+ "hosts": {
+ "52:74:B7:2C:04:F1/None": {
+ "basic": {
+ "name": "UE simulator (INT sink)",
+ "ips": [
+ "160.0.2.1",
+ "160.0.2.2",
+ "160.0.2.3",
+ "160.0.2.4",
+ "160.0.2.5",
+ "160.0.2.6",
+ "160.0.2.7",
+ "160.0.2.8",
+ "160.0.2.9",
+ "160.0.2.10"
+ ],
+ "locations": [
+ "device:tofino:leaf1/146"
+ ]
+ }
+ }
+ }
+}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-mellanox.json b/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
new file mode 100644
index 0000000..00cddbe
--- /dev/null
+++ b/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
@@ -0,0 +1,16 @@
+{
+ "devices": {
+ "device:mellanox: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": []
+ }
+ }
+ }
+}
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
index cdf6bfc..7a427e9 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
@@ -1,6 +1,7 @@
{
"devices": {
"device:tofino:leaf1": {
+ "chassisId": "000000000204",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.221",
@@ -10,7 +11,7 @@
}
},
"piPipeconf": {
- "piPipeconfId": "org.onosproject.pipelines.fabric.montara"
+ "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int-1.montara"
},
"ports": {
"1/0": {
@@ -52,6 +53,22 @@
"number": 146,
"removed": false,
"type": "copper"
+ },
+ "3/3": {
+ "name": "3/3",
+ "speed": 10000,
+ "enabled": true,
+ "number": 147,
+ "removed": false,
+ "type": "copper"
+ },
+ "5/0": {
+ "name": "5/0",
+ "speed": 100000,
+ "enabled": true,
+ "number": 160,
+ "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 d0c8607..c6069af 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
@@ -1,6 +1,7 @@
{
"devices": {
"device:tofino:leaf2": {
+ "chassisId": "000000000205",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.222",
@@ -10,7 +11,7 @@
}
},
"piPipeconf": {
- "piPipeconfId": "org.onosproject.pipelines.fabric-spgw.montara"
+ "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int-2.montara"
},
"ports": {
"1/0": {
@@ -53,27 +54,21 @@
"removed": false,
"type": "copper"
},
- "4/0": {
- "name": "4/0",
- "speed": 40000,
+ "3/3": {
+ "name": "3/3",
+ "speed": 10000,
"enabled": true,
- "number": 152,
+ "number": 147,
"removed": false,
- "type": "copper",
- "annotations": {
- "autoneg": "true"
- }
+ "type": "copper"
},
"5/0": {
"name": "5/0",
- "speed": 40000,
+ "speed": 100000,
"enabled": true,
"number": 160,
"removed": false,
- "type": "copper",
- "annotations": {
- "autoneg": "true"
- }
+ "type": "copper"
}
},
"basic": {
diff --git a/p4-pod-configs/mwc-pod/vtn-rules.json b/p4-pod-configs/mwc-pod/vtn-rules.json
index cbc0b62..689433e 100644
--- a/p4-pod-configs/mwc-pod/vtn-rules.json
+++ b/p4-pod-configs/mwc-pod/vtn-rules.json
@@ -1,35 +1,35 @@
{
- "flows": [
+ "flows": [
{
- "deviceId":"of:0000001e67d2c98b",
- "isPermanent":true,
- "priority":60000,
- "selector":{
- "criteria":[
- {
- "ethType":"0x800",
- "type":"ETH_TYPE"
- },
- {
- "ip":"122.0.0.0/24",
- "type":"IPV4_SRC"
- },
- {
- "ip":"118.0.0.0/24",
- "type":"IPV4_DST"
- }
- ]
- },
- "tableId":0,
- "timeout":0,
- "treatment":{
- "instructions":[
- {
- "type":"TABLE",
- "tableId": "4"
- }
- ]
- }
+ "deviceId": "of:0000001e67d2c98b",
+ "isPermanent": true,
+ "priority": 60000,
+ "selector": {
+ "criteria": [
+ {
+ "ethType": "0x800",
+ "type": "ETH_TYPE"
+ },
+ {
+ "ip": "122.0.0.0/24",
+ "type": "IPV4_SRC"
+ },
+ {
+ "ip": "118.0.0.0/24",
+ "type": "IPV4_DST"
+ }
+ ]
+ },
+ "tableId": 0,
+ "timeout": 0,
+ "treatment": {
+ "instructions": [
+ {
+ "type": "TABLE",
+ "tableId": "4"
+ }
+ ]
+ }
}
- ]
+ ]
}