Driver fixes, Device device discovery in Sanity, two case additions to Perf
diff --git a/TestON/tests/MininetTest/MininetTest.py b/TestON/tests/MininetTest/MininetTest.py
index 28850a4..72fab6e 100644
--- a/TestON/tests/MininetTest/MininetTest.py
+++ b/TestON/tests/MininetTest/MininetTest.py
@@ -8,6 +8,7 @@
main.case("Testing the configuration of the host")
main.step("Host IP Checking using checkIP")
+ main.ONOS1.start()
result = main.Mininet1.checkIP(main.params['CASE1']['destination'])
main.step("Verifying the result")
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
diff --git a/TestON/tests/MininetTest/MininetTest.topo b/TestON/tests/MininetTest/MininetTest.topo
index 645a8cb..1515f57 100644
--- a/TestON/tests/MininetTest/MininetTest.topo
+++ b/TestON/tests/MininetTest/MininetTest.topo
@@ -1,8 +1,72 @@
<TOPOLOGY>
-
<COMPONENT>
+ <Zookeeper1>
+ <host>10.128.100.1</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>ZookeeperCliDriver</type>
+ <connect_order>1</connect_order>
+ </Zookeeper1>
+
+ <Cassandra1>
+ <host>10.128.100.1</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>CassandraCliDriver</type>
+ <connect_order>2</connect_order>
+ </Cassandra1>
+ <Cassandra2>
+ <host>10.128.100.4</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>CassandraCliDriver</type>
+ <connect_order>3</connect_order>
+ </Cassandra2>
+ <Cassandra3>
+ <host>10.128.100.5</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>CassandraCliDriver</type>
+ <connect_order>4</connect_order>
+ </Cassandra3>
+ <Cassandra4>
+ <host>10.128.100.6</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>CassandraCliDriver</type>
+ <connect_order>5</connect_order>
+ </Cassandra4>
+
+ <ONOS1>
+ <host>10.128.100.1</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>6</connect_order>
+ </ONOS1>
+ <ONOS2>
+ <host>10.128.100.4</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>7</connect_order>
+ </ONOS2>
+ <ONOS3>
+ <host>10.128.100.5</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>8</connect_order>
+ </ONOS3>
+ <ONOS4>
+ <host>10.128.100.6</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>9</connect_order>
+ </ONOS4>
<Mininet1>
- <host>10.128.7.7</host>
+ <host>10.128.100.11</host>
<user>admin</user>
<password>onos_test</password>
<type>MininetCliDriver</type>