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/mwc-pod/sr-conf-int-to-compute-2.json b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
index 2174094..a656580 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
@@ -1,12 +1,12 @@
 {
   "ports": {
-    "device:tofino:leaf2/160": {
+    "device:leaf2/160": {
       "interfaces": [ ]
     },
-    "device:tofino:leaf1/146": {
+    "device:leaf1/146": {
       "interfaces": [ ]
     },
-    "device:tofino:leaf2/147": {
+    "device:leaf2/147": {
       "interfaces": [
         {
           "name": "leaf2/3/3--compute-1--ens802f1",
@@ -35,7 +35,7 @@
           "160.0.2.10"
         ],
         "locations": [
-          "device:tofino:leaf2/147"
+          "device:leaf2/147"
         ]
       }
     }