Updated configs to remove vendor name from device ID

Also running demo pod with two cavium spines

Change-Id: I3a220b0025f1eb5e4e80a7a7ae6737345b3e98ab
diff --git a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
index cf58289..629f5e0 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -1,11 +1,11 @@
 {
   "devices": {
-    "device:tofino:leaf2": {
+    "device:leaf2": {
       "chassisId": "000000000205",
       "generalprovider": {
         "p4runtime": {
           "ip": "10.128.13.222",
-          "deviceKeyId": "p4runtime:device:tofino:leaf2",
+          "deviceKeyId": "p4runtime:device:leaf2",
           "port": 50051,
           "deviceId": 0
         }