Merge pull request #33 from pingping-lin/ONOS-Next
change configuration for TestOn on proxmox
diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index acb0831..e0f793b 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -313,7 +313,8 @@
self.handle.expect("")
self.handle.expect("\$")
main.log.info("I in host " + str(ip_address))
- self.handle.sendline(ping_test_file + ">" + ping_test_result_file + "&")
+ main.log.info(ping_test_file + " > " + ping_test_result_file + " &")
+ self.handle.sendline(ping_test_file + " > " + ping_test_result_file + " &")
self.handle.expect("\$", timeout=60)
handle = self.handle.before
diff --git a/TestON/tests/ONOSNextTest/__init__.py b/TestON/tests/ONOSNextTest/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/ONOSNextTest/__init__.py
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.params b/TestON/tests/SdnIpTest/SdnIpTest.params
index 9d3627a..e9121a9 100755
--- a/TestON/tests/SdnIpTest/SdnIpTest.params
+++ b/TestON/tests/SdnIpTest/SdnIpTest.params
@@ -4,11 +4,11 @@
#Environment variables
<ENV>
- <cellName>driver_test</cellName>
+ <cellName>sdnip_single_instance</cellName>
</ENV>
<CTRL>
- <ip1>127.0.0.1</ip1>
+ <ip1>10.128.4.52</ip1>
<port1>6633</port1>
</CTRL>
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.py b/TestON/tests/SdnIpTest/SdnIpTest.py
index acd9b0f..732da3e 100755
--- a/TestON/tests/SdnIpTest/SdnIpTest.py
+++ b/TestON/tests/SdnIpTest/SdnIpTest.py
@@ -1,4 +1,4 @@
-from cupshelpers.config import prefix
+#from cupshelpers.config import prefix
# Testing the basic functionality of SDN-IP
@@ -21,7 +21,7 @@
import json
from operator import eq
# from datetime import datetime
- from time import gmtime, strftime
+ from time import localtime, strftime
main.case("The test case is to help to setup the TestON environment and test new drivers")
SDNIP_JSON_FILE_PATH = "../tests/SdnIpTest/sdnip.json"
@@ -150,7 +150,7 @@
# wait until all MultiPointToSinglePoint
time.sleep(20)
ping_test_script = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
- ping_test_results_file = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-results-before-delete-routes-" + strftime("%Y-%m-%d-%H:%M:%S", gmtime()) + ".txt"
+ ping_test_results_file = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-results-before-delete-routes-" + strftime("%Y-%m-%d_%H:%M:%S", localtime()) + ".txt"
ping_test_results = main.QuaggaCliHost.ping_test("1.168.30.100", ping_test_script, ping_test_results_file)
main.log.info(ping_test_results)
@@ -185,9 +185,10 @@
time.sleep(20)
ping_test_script = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-as2host.sh"
- ping_test_results_file = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-results-after-delete-routes-" + strftime("%Y-%m-%d-%H:%M:%S", gmtime()) + ".txt"
+ ping_test_results_file = "~/SDNIP/SdnIpIntentDemo/CASE1-ping-results-after-delete-routes-" + strftime("%Y-%m-%d_%H:%M:%S", localtime()) + ".txt"
ping_test_results = main.QuaggaCliHost.ping_test("1.168.30.100", ping_test_script, ping_test_results_file)
main.log.info(ping_test_results)
+ time.sleep(30)
# main.step("Test whether Mininet is started")
# main.Mininet2.handle.sendline("xterm host1")
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.topo b/TestON/tests/SdnIpTest/SdnIpTest.topo
index 51b5ac8..6df1975 100755
--- a/TestON/tests/SdnIpTest/SdnIpTest.topo
+++ b/TestON/tests/SdnIpTest/SdnIpTest.topo
@@ -3,8 +3,8 @@
<ONOSbench>
<host>127.0.0.1</host>
- <user>sdn</user>
- <password>rocks</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS> </COMPONENTS>
@@ -12,15 +12,15 @@
<ONOScli>
<host>127.0.0.1</host>
- <user>sdn</user>
- <password>rocks</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOScli>
<ONOS1>
- <host>127.0.0.1</host>
+ <host>10.128.4.52</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -30,24 +30,24 @@
<QuaggaCliHost3>
<host>127.0.0.1</host>
- <user>username</user>
- <password>password</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>QuaggaCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
</QuaggaCliHost3>
<QuaggaCliHost4>
<host>127.0.0.1</host>
- <user>username</user>
- <password>password</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>QuaggaCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
</QuaggaCliHost4>
<QuaggaCliHost>
<host>127.0.0.1</host>
- <user>username</user>
- <password>password</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>QuaggaCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>