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/hosts.json b/p4-pod-configs/mwc-pod/hosts.json
index db72039..5d8e695 100644
--- a/p4-pod-configs/mwc-pod/hosts.json
+++ b/p4-pod-configs/mwc-pod/hosts.json
@@ -7,7 +7,7 @@
           "10.6.1.3"
         ],
         "locations": [
-          "device:tofino:leaf1/144"
+          "device:leaf1/144"
         ]
       }
     },
@@ -19,7 +19,7 @@
           "118.0.0.10"
         ],
         "locations": [
-          "device:tofino:leaf1/145"
+          "device:leaf1/145"
         ]
       }
     },
@@ -30,7 +30,7 @@
           "10.6.2.2"
         ],
         "locations": [
-          "device:tofino:leaf2/144"
+          "device:leaf2/144"
         ]
       }
     },
@@ -41,7 +41,7 @@
           "150.0.0.10"
         ],
         "locations": [
-          "device:tofino:leaf2/146"
+          "device:leaf2/146"
         ]
       }
     },
@@ -52,7 +52,7 @@
           "119.0.0.2"
         ],
         "locations": [
-          "device:tofino:leaf1/144"
+          "device:leaf1/144"
         ]
       }
     },
@@ -63,7 +63,7 @@
           "118.0.0.2"
         ],
         "locations": [
-          "device:tofino:leaf1/144"
+          "device:leaf1/144"
         ]
       }
     },
@@ -74,7 +74,7 @@
           "122.0.0.4"
         ],
         "locations": [
-          "device:tofino:leaf2/144"
+          "device:leaf2/144"
         ]
       }
     },
@@ -94,7 +94,7 @@
           "160.0.2.10"
         ],
         "locations": [
-          "device:tofino:leaf2/160"
+          "device:leaf2/160"
         ]
       }
     },
@@ -114,7 +114,7 @@
           "160.0.1.10"
         ],
         "locations": [
-          "device:tofino:leaf1/160"
+          "device:leaf1/160"
         ]
       }
     },
@@ -125,7 +125,7 @@
           "10.6.1.100"
         ],
         "locations": [
-          "device:tofino:leaf1/147"
+          "device:leaf1/147"
         ]
       }
     }