Driver fixes, Device device discovery in Sanity, two case additions to Perf
diff --git a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
index 9086c16..48fc2a7 100644
--- a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
+++ b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
@@ -122,14 +122,14 @@
         </ONOS4>
 
         <Mininet1>
-            <host>10.128.100.4</host>
+            <host>10.128.100.11</host>
             <user>admin</user>
             <password>onos_test</password>
             <type>MininetCliDriver</type>
             <connect_order>13</connect_order>
             <COMPONENTS>
                 # Specify the Option for mininet
-                <arg1> --custom ~/mininet/custom/topo-2sw-2host.py </arg1>
+                <arg1> --custom ~/mininet/custom/topo-onos4node.py </arg1>
                 <arg2> --topo mytopo</arg2>
                 <controller> remote </controller>
              </COMPONENTS>