Fixes to allow running p4 trellis scenario

Change-Id: I4882668168521b9119692ecd696189b2b8d5f9de
(cherry picked from commit a61ba5792d9e7a25d3446f37179fbf13ac152098)
diff --git a/tools/test/scenarios/net-trellis-p4-devices.xml b/tools/test/scenarios/net-trellis-p4-devices.xml
new file mode 100644
index 0000000..1b79eab
--- /dev/null
+++ b/tools/test/scenarios/net-trellis-p4-devices.xml
@@ -0,0 +1,37 @@
+<!--
+  ~ Copyright 2018-present Open Networking Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+
+
+<scenario name="net-trellis-p4-devices" description="Trellis P4 network device check steps">
+
+        <group name="Net-Trellis-P4-Devices">
+
+            <step name="Net-Trellis-P4-Devices.Device-1"
+                  exec="onos-find-device ${OC1} device:bmv2:s204"/>
+
+            <step name="Net-Trellis-P4-Devices.Device-2"
+                  exec="onos-find-device ${OC1} device:bmv2:s205"/>
+
+            <step name="Net-Trellis-P4-Devices.Device-3"
+                  exec="onos-find-device ${OC1} device:bmv2:s226"/>
+
+            <step name="Net-Trellis-P4-Devices.Device-4"
+                  exec="onos-find-device ${OC1} device:bmv2:s227"/>
+
+        </group>
+
+</scenario>
\ No newline at end of file