diff --git a/mwc-provision-dev-cavium-test.sh b/mwc-provision-dev-cavium-test.sh
new file mode 100755
index 0000000..c2465ea
--- /dev/null
+++ b/mwc-provision-dev-cavium-test.sh
@@ -0,0 +1,25 @@
+#!/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/dev-pod/sr-conf-base.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/sr-conf-cavium.json
+sleep 1
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+sleep 5
+# onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mellanox-spine2.json
+# sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
+sleep 5
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+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-dev-mlx-test.sh b/mwc-provision-dev-mlx-test.sh
new file mode 100755
index 0000000..e665344
--- /dev/null
+++ b/mwc-provision-dev-mlx-test.sh
@@ -0,0 +1,23 @@
+#!/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/dev-pod/mwc-demo-mlx-test.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mellanox-spine2.json
+sleep 5
+# onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
+# sleep 5
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+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-dev.sh b/mwc-provision-dev.sh
index c6b1291..d6579d2 100755
--- a/mwc-provision-dev.sh
+++ b/mwc-provision-dev.sh
@@ -20,4 +20,4 @@
 sleep 5
 bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
 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/p4-pod-configs/dev-pod/cavium-spine1.json b/p4-pod-configs/dev-pod/cavium-spine1.json
index 0749d84..102ca0f 100644
--- a/p4-pod-configs/dev-pod/cavium-spine1.json
+++ b/p4-pod-configs/dev-pod/cavium-spine1.json
@@ -1,7 +1,6 @@
 {
   "devices": {
     "device:cavium:spine1": {
-      "chassisId": "000000000226",
       "generalprovider": {
         "p4runtime": {
           "ip": "10.128.13.101",
diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
index 774cbf7..56f0726 100644
--- a/p4-pod-configs/dev-pod/hosts.json
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -1,8 +1,8 @@
 {
   "hosts": {
-    "00:1E:67:D2:EC:7F/None": {
+    "00:1E:67:D2:EC:7E/None": {
       "basic": {
-        "name": "Compute node 1",
+        "name": "Compute Node 1",
         "ips": ["10.6.1.3"],
         "locations": ["device:tofino:leaf1/180"]
       }
@@ -10,58 +10,65 @@
     "00:AD:DE:00:00:80/None": {
       "basic": {
         "name": "eNodeB",
-        "ips": ["119.0.0.10", "118.0.0.10", "201.0.0.10", "202.0.0.10"],
-        "locations": ["device:tofino:leaf1/181"]
-      }
-    },
-    "00:AD:DE:00:00:81/None": {
-      "basic": {
-        "name": "eNodeB 2",
-        "ips": ["119.0.0.11", "118.0.0.11"],
+        "ips": ["119.0.0.10", "118.0.0.10"],
         "locations": ["device:tofino:leaf1/181"]
       }
     },
     "00:1E:67:D2:EE:EE/None": {
       "basic": {
-        "name": "Compute node 2",
+        "name": "Compute Node 2",
         "ips": ["10.6.2.2"],
         "locations": ["device:tofino:leaf2/180"]
       }
     },
     "72:9D:0F:57:D5:BD/None": {
       "basic": {
-        "name": "ARM server",
+        "name": "ARM Server",
         "ips": ["150.0.0.10"],
         "locations": ["device:tofino:leaf2/182"]
       }
     },
     "fa:16:3e:95:0f:87/None": {
       "basic": {
-        "name": "spgw-u 1",
+        "name": "NGIC-DP-1",
         "ips": ["119.0.0.2"],
         "locations": ["device:tofino:leaf1/180"]
       }
     },
     "fa:16:3e:64:cc:23/None": {
       "basic": {
-        "name": "MME1",
+        "name": "MME-1",
         "ips": ["118.0.0.2"],
         "locations": ["device:tofino:leaf1/180"]
       }
     },
     "fa:16:3e:26:68:30/None": {
       "basic": {
-        "name": "MME2",
+        "name": "MME-2",
         "ips": ["122.0.0.2"],
         "locations": ["device:tofino:leaf2/180"]
       }
     },
     "00:1E:67:D2:EE:EB/None": {
       "basic": {
-        "name": "head node",
+        "name": "Head Node",
         "ips": ["118.0.0.11"],
         "locations": ["device:tofino:leaf1/182"]
       }
+    },
+    "21:A9:6F:CA:A5:01/None": {
+      "basic": {
+        "name": "UE simulator (INT sink)",
+        "ips": ["160.0.1.1"],
+        "locations": ["device:tofino:leaf1/172"]
+      }
+    },
+    "21:A9:6F:CA:A5:02/None": {
+      "basic": {
+        "name": "Internet simulator (INT source)",
+        "ips": ["160.0.2.1"],
+        "locations": ["device:tofino:leaf2/172"]
+      }
     }
   }
 }
diff --git a/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json b/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json
new file mode 100644
index 0000000..ed5fa58
--- /dev/null
+++ b/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json
@@ -0,0 +1,134 @@
+{
+  "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: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/180": {
+      "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/181": {
+      "interfaces": [
+        {
+          "name": "leaf1-3/1-mgmt25-enb",
+          "ips": [
+            "118.0.0.254/24",
+            "119.0.0.254/24"
+          ],
+          "vlan-untagged": 10
+        }
+      ]
+    },
+    "device:tofino:leaf1/182": {
+      "interfaces": [
+        {
+          "name": "leaf1-3/2--head-node(ProgRAN)",
+          "ips": [
+            "118.0.0.254/24"
+          ],
+          "vlan-untagged": 10
+        }
+      ]
+    },
+    "device:tofino:leaf2/180": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/0-compute-2",
+          "ips": [
+            "10.6.2.254/24",
+            "122.0.0.254/24"
+          ],
+          "vlan-untagged": 20
+        }
+      ]
+    },
+    "device:tofino:leaf2/181": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/1-P4-DP",
+          "ips": [
+            "140.0.0.2/24"
+          ],
+          "vlan-untagged": 20
+        }
+      ]
+    },
+    "device:tofino:leaf2/182": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/2-------mgmt-27---ARM",
+          "ips": [
+            "150.0.0.254/24"
+          ],
+          "vlan-untagged": 150
+        }
+      ]
+    },
+    "device:tofino:leaf1/172": {
+      "interfaces": [
+        {
+          "name": "leaf1-5/0--int-sink",
+          "ips": [
+            "160.0.1.254/24"
+          ],
+          "vlan-untagged": 161
+        }
+      ]
+    },
+    "device:tofino:leaf2/172": {
+      "interfaces": [
+        {
+          "name": "leaf2-5/0--int-source",
+          "ips": [
+            "160.0.2.254/24"
+          ],
+          "vlan-untagged": 162
+        }
+      ]
+    }
+  }
+}
diff --git a/p4-pod-configs/dev-pod/mwc-demo.json b/p4-pod-configs/dev-pod/mwc-demo.json
index 416b7a6..7e345e3 100644
--- a/p4-pod-configs/dev-pod/mwc-demo.json
+++ b/p4-pod-configs/dev-pod/mwc-demo.json
@@ -69,9 +69,7 @@
           "name": "leaf1-3/1-mgmt25-enb",
           "ips": [
             "118.0.0.254/24",
-            "119.0.0.254/24",
-            "201.0.0.254/24",
-            "202.0.0.254/24"
+            "119.0.0.254/24"
           ],
           "vlan-untagged": 10
         }
@@ -121,6 +119,28 @@
           "vlan-untagged": 150
         }
       ]
+    },
+    "device:tofino:leaf1/172": {
+      "interfaces": [
+        {
+          "name": "leaf1-5/0-nc1-int-sink",
+          "ips": [
+            "160.0.1.254/24"
+          ],
+          "vlan-untagged": 160
+        }
+      ]
+    },
+    "device:tofino:leaf2/172": {
+      "interfaces": [
+        {
+          "name": "leaf2-5/0-nc2-int-source",
+          "ips": [
+            "160.0.2.254/24"
+          ],
+          "vlan-untagged": 160
+        }
+      ]
     }
   }
 }
diff --git a/p4-pod-configs/dev-pod/sr-conf-base.json b/p4-pod-configs/dev-pod/sr-conf-base.json
new file mode 100644
index 0000000..0caec66
--- /dev/null
+++ b/p4-pod-configs/dev-pod/sr-conf-base.json
@@ -0,0 +1,122 @@
+{
+  "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": []
+      }
+    }
+  },
+  "ports": {
+    "device:tofino:leaf1/180": {
+      "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/181": {
+      "interfaces": [
+        {
+          "name": "leaf1-3/1-mgmt25-enb",
+          "ips": [
+            "118.0.0.254/24",
+            "119.0.0.254/24"
+          ],
+          "vlan-untagged": 10
+        }
+      ]
+    },
+    "device:tofino:leaf1/182": {
+      "interfaces": [
+        {
+          "name": "leaf1-3/2--head-node(ProgRAN)",
+          "ips": [
+            "118.0.0.254/24"
+          ],
+          "vlan-untagged": 10
+        }
+      ]
+    },
+    "device:tofino:leaf2/180": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/0-compute-2",
+          "ips": [
+            "10.6.2.254/24",
+            "122.0.0.254/24"
+          ],
+          "vlan-untagged": 20
+        }
+      ]
+    },
+    "device:tofino:leaf2/181": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/1-P4-DP",
+          "ips": [
+            "140.0.0.2/24"
+          ],
+          "vlan-untagged": 20
+        }
+      ]
+    },
+    "device:tofino:leaf2/182": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/2-------mgmt-27---ARM",
+          "ips": [
+            "150.0.0.254/24"
+          ],
+          "vlan-untagged": 150
+        }
+      ]
+    },
+    "device:tofino:leaf1/172": {
+      "interfaces": [
+        {
+          "name": "leaf1-5/0--int-sink",
+          "ips": [
+            "160.0.1.254/24"
+          ],
+          "vlan-untagged": 161
+        }
+      ]
+    },
+    "device:tofino:leaf2/172": {
+      "interfaces": [
+        {
+          "name": "leaf2-5/0--int-source",
+          "ips": [
+            "160.0.2.254/24"
+          ],
+          "vlan-untagged": 162
+        }
+      ]
+    }
+  }
+}
diff --git a/p4-pod-configs/dev-pod/sr-conf-cavium.json b/p4-pod-configs/dev-pod/sr-conf-cavium.json
new file mode 100644
index 0000000..91591a8
--- /dev/null
+++ b/p4-pod-configs/dev-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/dev-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
index 10b005a..8210578 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -53,6 +53,14 @@
           "number": 182,
           "removed": false,
           "type": "copper"
+        },
+        "5/0": {
+          "name": "5/0",
+          "speed": 100000,
+          "enabled": true,
+          "number": 172,
+          "removed": false,
+          "type": "copper"
         }
       },
       "basic": {
diff --git a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
index 2befe1e..53f0270 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -61,6 +61,14 @@
           "number": 183,
           "removed": false,
           "type": "copper"
+        },
+        "5/0": {
+          "name": "5/0",
+          "speed": 100000,
+          "enabled": true,
+          "number": 172,
+          "removed": false,
+          "type": "copper"
         }
       },
       "basic": {
diff --git a/p4-pod-configs/mwc-pod/hosts.json b/p4-pod-configs/mwc-pod/hosts.json
index d75f0bb..01e8d89 100644
--- a/p4-pod-configs/mwc-pod/hosts.json
+++ b/p4-pod-configs/mwc-pod/hosts.json
@@ -2,7 +2,7 @@
   "hosts": {
     "00:1e:67:d2:ee:b2/None": {
       "basic": {
-        "name": "Compute node 1",
+        "name": "Compute Node 1",
         "ips": ["10.6.1.3"],
         "locations": ["device:tofino:leaf1/144"]
       }
@@ -16,35 +16,35 @@
     },
     "00:1e:67:d2:c9:8a/None": {
       "basic": {
-        "name": "Compute node 2",
+        "name": "Compute Node 2",
         "ips": ["10.6.2.2"],
         "locations": ["device:tofino:leaf2/144"]
       }
     },
     "72:9D:0F:57:D5:BD/None": {
       "basic": {
-        "name": "ARM server",
+        "name": "ARM Server",
         "ips": ["150.0.0.10"],
         "locations": ["device:tofino:leaf2/146"]
       }
     },
     "fa:16:3e:95:0f:87/None": {
       "basic": {
-        "name": "spgw-u 1",
+        "name": "NGIC-DP-1",
         "ips": ["119.0.0.2"],
         "locations": ["device:tofino:leaf1/144"]
       }
     },
     "fa:16:3e:64:cc:23/None": {
       "basic": {
-        "name": "MME1",
+        "name": "MME-1",
         "ips": ["118.0.0.2"],
         "locations": ["device:tofino:leaf1/144"]
       }
     },
     "fa:16:3e:49:75:ad/None": {
       "basic": {
-        "name": "MME2",
+        "name": "MME-2",
         "ips": ["122.0.0.4"],
         "locations": ["device:tofino:leaf2/144"]
       }