Add SDN-IP test && update Quagga and ONOS-cli drivers
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 4571387..282200d 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -1109,6 +1109,7 @@
main.cleanup()
main.exit()
+ # This method should be used after installing application: onos-app-sdnip
def routes(self, json_format=False):
'''
Optional:
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.py b/TestON/tests/SdnIpTest/SdnIpTest.py
index 369f2cd..18b23af 100755
--- a/TestON/tests/SdnIpTest/SdnIpTest.py
+++ b/TestON/tests/SdnIpTest/SdnIpTest.py
@@ -74,11 +74,9 @@
main.log.info(sorted(allRoutes))
main.log.info("Routes get from ONOS CLI:")
main.log.info(sorted(routes_list))
-
- if eq(sorted(allRoutes), sorted(routes_list)):
- main.log.report("***Routes in SDN-IP are correct!***")
- else:
- main.log.report("***Routes in SDN-IP are wrong!***")
+ utilities.assert_equals(expect=sorted(allRoutes), actual=sorted(routes_list),
+ onpass="***Routes in SDN-IP are correct!***",
+ onfail="***Routes in SDN-IP are wrong!***")
time.sleep(2)
main.step("Get intents installed on ONOS")
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.topo b/TestON/tests/SdnIpTest/SdnIpTest.topo
index a906c0e..1d23878 100755
--- a/TestON/tests/SdnIpTest/SdnIpTest.topo
+++ b/TestON/tests/SdnIpTest/SdnIpTest.topo
@@ -30,8 +30,8 @@
<Quaggacli>
<host>127.0.0.1</host>
- <user>linpp</user>
- <password>666666</password>
+ <user>username</user>
+ <password>password</password>
<type>QuaggaCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>