Changes to linc-oe driver / addition of linc-oe tests with startup functionality. Minor edits to TopoPerf
diff --git a/TestON/drivers/common/cli/emulator/lincoedriver.py b/TestON/drivers/common/cli/emulator/lincoedriver.py
index 7558077..0885d9e 100644
--- a/TestON/drivers/common/cli/emulator/lincoedriver.py
+++ b/TestON/drivers/common/cli/emulator/lincoedriver.py
@@ -56,17 +56,28 @@
self.ssh_handle = self.handle
if self.handle :
+ main.log.info("Handle successfully created")
self.home = "~/linc-oe"
self.handle.sendline("cd "+self.home)
+ self.handle.expect("oe$")
+ main.log.info("Building Linc-OE")
+ self.handle.sendline("make rel")
+ i = self.handle.expect(["ERROR","\$"])
+ if i == 0:
+ self.handle.sendline("sudo pkill -9 epmd")
+ self.handle.expect("\$")
+ self.handle.sendline("make rel")
+ x = self.handle.expect(["\$",pespect.EOF,pexpect.TIMEOUT])
+ main.log.info("make rel returned: "+ str(x))
+
main.log.info(self.name+": Starting Linc-OE CLI")
cmdStr = "sudo ./rel/linc/bin/linc console"
self.handle.sendline(cmdStr)
- #Sending blank lines "shows" the CLI
- self.handle.sendline("")
- self.handle.sendline("")
- self.handle.expect(["linc@",pexpect.EOF,pexpect.TIMEOUT])
+ self.handle.expect([">",pexpect.EOF,pexpect.TIMEOUT])
+
+ return main.TRUE
else:
main.log.error(self.name+
diff --git a/TestON/tests/LincOETest/LincOETest.params b/TestON/tests/LincOETest/LincOETest.params
new file mode 100755
index 0000000..e4dd3c8
--- /dev/null
+++ b/TestON/tests/LincOETest/LincOETest.params
@@ -0,0 +1,20 @@
+<PARAMS>
+
+ <testcases>1</testcases>
+
+ #Environment variables
+ <ENV>
+ <cellName>linc_oe_test</cellName>
+ </ENV>
+
+ <CTRL>
+ <ip1>10.128.174.1</ip1>
+ <port1>6633</port1>
+ </CTRL>
+
+ <GIT>
+ <autoPull>off</autoPull>
+ <checkout>master</checkout>
+ </GIT>
+
+</PARAMS>
diff --git a/TestON/tests/LincOETest/LincOETest.py b/TestON/tests/LincOETest/LincOETest.py
new file mode 100755
index 0000000..7a1f235
--- /dev/null
+++ b/TestON/tests/LincOETest/LincOETest.py
@@ -0,0 +1,316 @@
+#LincOETest
+#
+#Packet-Optical Intent Testing
+#
+#andrew@onlab.us
+
+
+import time
+import sys
+import os
+import re
+
+class LincOETest:
+ def __init__(self):
+ self.default = ''
+
+ def CASE1(self, main):
+ '''
+ Startup sequence:
+ git pull
+ mvn clean install
+ onos-package
+ cell <name>
+ onos-verify-cell
+ onos-install -f
+ onos-wait-for-start
+ '''
+ import time
+
+ cell_name = main.params['ENV']['cellName']
+
+ ONOS1_ip = main.params['CTRL']['ip1']
+ ONOS1_port = main.params['CTRL']['port1']
+
+ git_pull_trigger = main.params['GIT']['autoPull']
+ git_checkout_branch = main.params['GIT']['checkout']
+
+ main.case("Setting up test environment")
+
+ main.step("Creating cell file")
+ #params: (bench ip, cell name, mininet ip, *onos ips)
+ cell_file_result = main.ONOSbench.create_cell_file(
+ "10.128.20.10", cell_name, "10.128.10.90",
+ "onos-core-trivial,onos-app-fwd",
+ "10.128.174.1")
+
+ main.step("Applying cell variable to environment")
+ #cell_result = main.ONOSbench.set_cell(cell_name)
+ cell_result = main.ONOSbench.set_cell("temp_cell_2")
+ verify_result = main.ONOSbench.verify_cell()
+
+ if git_pull_trigger == 'on':
+ main.step("Git checkout and pull master")
+ main.ONOSbench.git_checkout(git_checkout_branch)
+ git_pull_result = main.ONOSbench.git_pull()
+ else:
+ main.log.info("Git checkout and pull skipped by config")
+ git_pull_result = main.TRUE
+
+ main.step("Using mvn clean & install")
+ #clean_install_result = main.ONOSbench.clean_install()
+ clean_install_result = main.TRUE
+
+ main.step("Creating ONOS package")
+ package_result = main.ONOSbench.onos_package()
+
+ main.step("Installing ONOS package")
+ onos_install_result = main.ONOSbench.onos_install()
+ onos1_isup = main.ONOSbench.isup()
+
+ main.step("Starting ONOS service")
+ start_result = main.ONOSbench.onos_start(ONOS1_ip)
+
+ case1_result = (clean_install_result and package_result and\
+ cell_result and verify_result and onos_install_result and\
+ onos1_isup and start_result )
+ utilities.assert_equals(expect=main.TRUE, actual=case1_result,
+ onpass="Test startup successful",
+ onfail="Test startup NOT successful")
+
+ time.sleep(10)
+
+
+ def CASE3(self, main):
+ '''
+ Test 'onos' command and its functionality in driver
+ '''
+
+ ONOS1_ip = main.params['CTRL']['ip1']
+
+ main.case("Testing 'onos' command")
+
+ main.step("Sending command 'onos -w <onos-ip> system:name'")
+ cmdstr1 = "system:name"
+ cmd_result1 = main.ONOSbench.onos_cli(ONOS1_ip, cmdstr1)
+ main.log.info("onos command returned: "+cmd_result1)
+
+ main.step("Sending command 'onos -w <onos-ip> onos:topology'")
+ cmdstr2 = "onos:topology"
+ cmd_result2 = main.ONOSbench.onos_cli(ONOS1_ip, cmdstr2)
+ main.log.info("onos command returned: "+cmd_result2)
+
+ main.step("Testing check_status")
+ check_status_results = main.ONOSbench.check_status(ONOS1_ip, 4, 6)
+ main.log.info("Results of check_status " + str(check_status_results))
+
+ main.step("Sending command 'onos -w <onos-ip> bundle:list'")
+ cmdstr3 = "bundle:list"
+ cmd_result3 = main.ONOSbench.onos_cli(ONOS1_ip, cmdstr3)
+ main.log.info("onos command returned: "+cmd_result3)
+ case3_result = (cmd_result1 and cmd_result2 and\
+ check_status_results and cmd_result3 )
+ utilities.assert_equals(expect=main.TRUE, actual=case3_result,
+ onpass="Test case 3 successful",
+ onfail="Test case 3 NOT successful")
+
+ def CASE4(self, main):
+ import re
+ import time
+ main.case("Pingall Test(No intents are added)")
+ main.step("Assigning switches to controllers")
+ for i in range(1,5): #1 to (num of switches +1)
+ main.Mininet1.assign_sw_controller(sw=str(i),
+ ip1=ONOS1_ip, port1=ONOS1_port)
+ switch_mastership = main.TRUE
+ for i in range (1,5):
+ response = main.Mininet1.get_sw_controller("s"+str(i))
+ print("Response is " + str(response))
+ if re.search("tcp:"+ONOS1_ip,response):
+ switch_mastership = switch_mastership and main.TRUE
+ else:
+ switch_mastership = main.FALSE
+
+ #REACTIVE FWD test
+ main.step("Pingall")
+ ping_result = main.FALSE
+ while ping_result == main.FALSE:
+ time1 = time.time()
+ ping_result = main.Mininet1.pingall()
+ time2 = time.time()
+ print "Time for pingall: %2f seconds" % (time2 - time1)
+
+ case4_result = switch_mastership and ping_result
+ utilities.assert_equals(expect=main.TRUE, actual=case4_result,
+ onpass="Pingall Test successful",
+ onfail="Pingall Test NOT successful")
+
+ def CASE5(self, main):
+ '''
+ Test the ONOS-cli functionality
+
+ Below are demonstrations of what the
+ ONOS cli driver functions can be used for.
+ '''
+ import time
+ import json
+
+ cell_name = main.params['ENV']['cellName']
+ ONOS1_ip = main.params['CTRL']['ip1']
+
+ main.case("Testing the ONOS-cli")
+
+ main.step("Set cell for ONOS-cli environment")
+ #main.ONOScli.set_cell(cell_name)
+ main.ONOScli.set_cell("temp_cell_2")
+
+ main.step("Start ONOS-cli")
+ main.ONOScli.start_onos_cli(ONOS1_ip)
+
+ main.step("issue command: onos:topology")
+ topology_obj = main.ONOScli.topology()
+
+ main.step("issue various feature:install <str> commands")
+ #main.ONOScli.feature_install("onos-app-fwd")
+ #main.ONOScli.feature_install("onos-rest")
+
+ main.step("Add a bad node")
+ node_result = main.ONOScli.add_node("111", "10.128.20.")
+ if node_result == main.TRUE:
+ main.log.info("Node successfully added")
+
+ main.step("Add a correct node")
+ node_result = main.ONOScli.add_node("111", "10.128.174.2")
+
+ main.step("Assign switches and list devices")
+ for i in range(1,8):
+ main.Mininet2.handle.sendline("sh ovs-vsctl set-controller s"+str(i)+
+ " tcp:10.128.174.1")
+ main.Mininet2.handle.expect("mininet>")
+ #Need to sleep to allow switch add processing
+ time.sleep(5)
+ list_result = main.ONOScli.devices(json_format=False)
+ main.log.info(list_result)
+
+ main.step("Get all devices id")
+ devices_id_list = main.ONOScli.get_all_devices_id()
+ main.log.info(devices_id_list)
+
+ main.step("Get path and cost between device 1 and 7")
+ (path, cost) = main.ONOScli.paths(devices_id_list[0], devices_id_list[6])
+ main.log.info("Path: "+str(path))
+ main.log.info("Cost: "+str(cost))
+
+ main.step("Get nodes currently visible")
+ nodes_str = main.ONOScli.nodes()
+ main.log.info(nodes_str)
+
+ main.step("Get all nodes id's")
+ node_id_list = main.ONOScli.get_all_nodes_id()
+ main.log.info(node_id_list)
+
+ main.step("Set device "+str(devices_id_list[0])+" to role: standby")
+ device_role_result = main.ONOScli.device_role(
+ devices_id_list[0], node_id_list[0], "standby")
+ if device_role_result == main.TRUE:
+ main.log.report("Device role successfully set")
+
+ main.step("Revert device role to master")
+ device_role = main.ONOScli.device_role(
+ devices_id_list[0], node_id_list[0], "master")
+
+ main.step("Check devices / role again")
+ dev_result = main.ONOScli.devices(json_format=False)
+ main.log.info(dev_result)
+
+ #Sample steps to push intents ***********
+ # * Obtain host id in ONOS format
+ # * Push intents
+ main.step("Get list of hosts from Mininet")
+ host_list = main.Mininet2.get_hosts()
+ main.log.info(host_list)
+
+ main.step("Get host list in ONOS format")
+ host_onos_list = main.ONOScli.get_hosts_id(host_list)
+ main.log.info(host_onos_list)
+
+ time.sleep(5)
+
+ #We must use ping from hosts we want to add intents from
+ #to make the hosts talk
+ #main.Mininet2.handle.sendline("\r")
+ #main.Mininet2.handle.sendline("h4 ping 10.1.1.1 -c 1 -W 1")
+ #time.sleep(3)
+ #main.Mininet2.handle.sendline("h5 ping 10.1.1.1 -c 1 -W 1")
+ #time.sleep(5)
+
+ main.ONOScli.feature_install("onos-app-fwd")
+
+ main.Mininet2.pingall()
+
+ time.sleep(5)
+
+ main.step("Get hosts")
+ main.ONOScli.handle.sendline("hosts")
+ main.ONOScli.handle.expect("onos>")
+ hosts = main.ONOScli.handle.before
+ main.log.info(hosts)
+
+ main.step("Install host-to-host-intents")
+ intent_install1 = main.ONOScli.add_host_intent(
+ host_onos_list[0], host_onos_list[1])
+ intent_install2 = main.ONOScli.add_host_intent(
+ host_onos_list[2], host_onos_list[3])
+ intent_install3 = main.ONOScli.add_host_intent(
+ host_onos_list[4], host_onos_list[5])
+
+ main.log.info(intent_install1)
+ main.log.info(intent_install2)
+ main.log.info(intent_install3)
+
+ main.step("Get intents installed on ONOS")
+ get_intent_result = main.ONOScli.intents()
+ main.log.info(get_intent_result)
+ #****************************************
+
+ #Sample steps to delete intents ********
+ main.step("Get all intent id's")
+ intent_id = main.ONOScli.get_all_intents_id()
+ main.log.info(intent_id)
+
+ main.step("Remove specified intent id: "+str(intent_id[0]))
+ intent_result = main.ONOScli.remove_intent(intent_id[0])
+ main.log.info(intent_result)
+
+ main.step("Check installed intents again")
+ get_intent_result = main.ONOScli.intents()
+ main.log.info(get_intent_result)
+ #***************************************
+
+ #Sample steps to add point-to-point intents*
+ main.step("Add point-to-point intents")
+ ptp_intent_result = main.ONOScli.add_point_intent(
+ devices_id_list[0], 1, devices_id_list[1], 2)
+ if ptp_intent_result == main.TRUE:
+ get_intent_result = main.ONOScli.intents()
+ main.log.info("Point to point intent install successful")
+ main.log.info(get_intent_result)
+ #*******************************************
+
+ main.step("Print intents in json format")
+ intents = main.ONOScli.intents(json_format = True)
+ main.log.info(intents)
+
+ main.step("Add eth options in point-to-point intent")
+ ptp_eth = main.ONOScli.add_point_intent(
+ devices_id_list[2], 1, devices_id_list[3], 2,
+ ethSrc = "00:02", ethDst = "00:03")
+ main.log.info(ptp_eth)
+
+ main.step("Print intents with eth options")
+ intents = main.ONOScli.intents()
+ main.log.info(intents)
+######
+#jhall@onlab.us
+#andrew@onlab.us
+######
diff --git a/TestON/tests/LincOETest/LincOETest.topo b/TestON/tests/LincOETest/LincOETest.topo
new file mode 100755
index 0000000..221256e
--- /dev/null
+++ b/TestON/tests/LincOETest/LincOETest.topo
@@ -0,0 +1,55 @@
+<TOPOLOGY>
+ <COMPONENT>
+
+ <ONOSbench>
+ <host>10.128.20.10</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>1</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOSbench>
+
+ <ONOScli>
+ <host>10.128.20.10</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOScli>
+
+ <ONOS1>
+ <host>10.128.174.1</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>3</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1>
+
+ <LincOE>
+ <host>10.128.10.90</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>LincOEDriver</type>
+ <connect_order>4</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </LincOE>
+
+ <Mininet1>
+ <host>10.128.10.90</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>MininetCliDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS>
+ <arg1> --custom optical.py </arg1>
+ <arg2> --arp --mac</arg2>
+ <arg3> --topo optical</arg3>
+ <controller> remote </controller>
+ </COMPONENTS>
+ </Mininet1>
+
+ </COMPONENT>
+</TOPOLOGY>
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.params b/TestON/tests/TopoPerfNext/TopoPerfNext.params
index d8d8b37..23b470b 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.params
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.params
@@ -12,7 +12,7 @@
</GIT>
<CTRL>
- <user>sdn</user>
+ <user>admin</user>
<ip1>10.128.20.11</ip1>
<port1>6633</port1>
<ip2>10.128.20.12</ip2>
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.py b/TestON/tests/TopoPerfNext/TopoPerfNext.py
index 2fe521b..8e36c95 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.py
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.py
@@ -50,7 +50,8 @@
main.log.info("Skipped git checkout and pull")
main.step("Using mvn clean & install")
- mvn_result = main.ONOSbench.clean_install()
+ #mvn_result = main.ONOSbench.clean_install()
+ mvn_result = main.TRUE
main.step("Creating ONOS package")
package_result = main.ONOSbench.onos_package()
@@ -66,8 +67,8 @@
verify_cell_result and checkout_result and\
pull_result and mvn_result and\
install_result and start_result,
- onpass="Cell file created successfully",
- onfail="Failed to create cell file")
+ onpass="ONOS started successfully",
+ onfail="Failed to start ONOS")
def CASE2(self, main):
'''
@@ -127,7 +128,7 @@
#Wait and ensure switch is assigned
#before stopping tshark
- time.sleep(10)
+ time.sleep(20)
main.ONOS1.stop_tshark()
@@ -136,10 +137,12 @@
main.log.info("Copying over tshark files")
#TCP CAPTURE ****
- ssh_tcp_file = subprocess.Popen(['ssh',
- ONOS_user+"@"+ONOS1_ip, 'cat',
- tshark_tcp_output], stdout=subprocess.PIPE)
- temp_text = ssh_tcp_file.stdout.readline()
+ #Copy the tshark output from ONOS machine to
+ #TestON machine in tshark_tcp_output directory>file
+ os.system("scp "+ONOS_user+"@"+ONOS1_ip+":"+
+ tshark_tcp_output+" /tmp/")
+ tcp_file = open(tshark_tcp_output, 'r')
+ temp_text = tcp_file.readline()
temp_text = temp_text.split(" ")
main.log.info("Object read in from TCP capture: "+
@@ -151,16 +154,19 @@
" returned unexpected results")
t0_tcp = 0
assertion = main.FALSE
+
+ tcp_file.close()
#****************
#OF CAPTURE ****
- ssh_of_file = subprocess.Popen(['ssh',
- ONOS_user+"@"+ONOS1_ip, 'cat',
- tshark_of_output], stdout=subprocess.PIPE)
-
+ os.system("scp "+ONOS_user+"@"+ONOS1_ip+":"+
+ tshark_of_output+" /tmp/")
+ of_file = open(tshark_of_output, 'r')
+
+ line_ofp = ""
while True:
- temp_text = ssh_of_file.stdout.readline()
- if line !='':
+ temp_text = of_file.readline()
+ if temp_text !='':
line_ofp = temp_text
else:
break
@@ -176,6 +182,8 @@
" returned unexpected results")
t0_ofp = 0
assertion = main.FALSE
+
+ of_file.close()
#****************
#TODO:
@@ -208,7 +216,153 @@
main.log.info("ONOS2 delta TCP: "+str(delta_tcp_2))
main.log.info("ONOS3 delta TCP: "+str(delta_tcp_3))
+ main.step("Remove switch from controller")
+ main.Mininet1.delete_sw_controller("s1")
+ time.sleep(5)
+ utilities.assert_equals(expect=main.TRUE, actual=assertion,
+ onpass="Switch latency test successful",
+ onfail="Switch latency test failed")
+
+ def CASE3(self, main):
+ '''
+ Bring port up / down and measure latency.
+ Port enable / disable is simulated by ifconfig up / down
+ '''
+ import time
+ import subprocess
+ import os
+ import requests
+ import json
+ ONOS1_ip = main.params['CTRL']['ip1']
+ default_sw_port = main.params['CTRL']['port1']
+ ONOS_user = main.params['CTRL']['user']
+ num_iter = main.params['TEST']['numIter']
+
+ tshark_port_status = "OFP 130 Port Status"
+
+ tshark_port_up = "/tmp/tshark_port_up.txt"
+ tshark_port_down = "/tmp/tshark_port_down.txt"
+
+ main.log.report("Port enable / disable latency")
+
+ main.step("Assign switch to controller")
+ main.Mininet1.assign_sw_controller(sw="1",ip1=ONOS1_ip,
+ port1=default_sw_port)
+
+ main.step("Verify switch is assigned correctly")
+ result_s1 = main.Mininet1.get_sw_controller(sw="s1")
+ if result_s1 == main.FALSE:
+ main.log.info("Switch s1 was not assigned correctly")
+ assertion = main.FALSE
+ else:
+ main.log.info("Switch s1 was assigned correctly")
+
+ for i in range(0, int(num_iter)):
+ main.step("Starting wireshark capture for port status down")
+ main.ONOS1.tshark_grep(tshark_port_status,
+ tshark_port_down)
+
+ time.sleep(10)
+
+ main.step("Disable port (interface s1-eth2)")
+ main.Mininet2.handle.sendline("sudo ifconfig s1-eth2 down")
+ main.Mininet2.handle.expect("\$")
+ time.sleep(20)
+
+ main.ONOS1.tshark_stop()
+ time.sleep(5)
+
+ #Copy tshark output file from ONOS to TestON instance
+ #/tmp directory
+ os.system("scp "+ONOS_user+"@"+ONOS1_ip+":"+
+ tshark_port_down+" /tmp/")
+
+ f_port_down = open(tshark_port_down, 'r')
+ f_line = f_port_down.readline()
+ obj_down = f_line.split(" ")
+ if len(f_line) > 0:
+ timestamp_begin_pt_down = int(float(obj_down[1])*1000)
+ else:
+ main.log.info("Tshark output file returned unexpected"+
+ " results")
+ timestamp_begin_pt_down = 0
+
+ main.step("Obtain t1 by REST call")
+ #TODO: Implement json object parsing here
+
+ timestamp_end_pt_down_1 = 0
+ timestamp_end_pt_down_2 = 0
+ timestamp_end_pt_down_3 = 0
+
+ delta_pt_down_1 = int(timestamp_end_pt_down_1) - \
+ int(timestamp_begin_pt_down)
+ delta_pt_down_2 = int(timestamp_end_pt_down_2) - \
+ int(timestamp_begin_pt_down)
+ delta_pt_down_3 = int(timestamp_end_pt_down_3) - \
+ int(timestamp_begin_pt_down)
+
+ #TODO: Remove these logs. For test purposes only
+ main.log.info("Delta1: "+str(delta_pt_down_1))
+ main.log.info("Delta2: "+str(delta_pt_down_2))
+ main.log.info("Delta3: "+str(delta_pt_down_3))
+
+ #Port up events
+ main.step("Enable port and obtain timestamp")
+ main.step("Starting wireshark capture for port status up")
+ main.ONOS1.tshark_grep("OFP 130 Port Status", tshark_port_up)
+ time.sleep(10)
+
+ main.Mininet2.handle.sendline("sudo ifconfig s1-eth2 up")
+ main.Mininet2.handle.expect("\$")
+ time.sleep(20)
+
+ os.system("scp "+ONOS_user+"@"+ONOS1_ip+":"+
+ tshark_port_up+" /tmp/")
+
+ f_port_up = open(tshark_port_up, 'r')
+ f_line = f_port_down.readline()
+ obj_up = f_line.split(" ")
+ if len(f_line) > 0:
+ timestamp_begin_pt_up = int(float(obj_up[1])*1000)
+ else:
+ main.log.info("Tshark output file returned unexpected"+
+ " results.")
+ timestamp_begin_pt_up = 0
+
+ main.step("Obtain t1 by REST call")
+ #TODO: Implement json object parsing here
+
+ timestamp_end_pt_up_1 = 0
+ timestamp_end_pt_up_2 = 0
+ timestamp_end_pt_up_3 = 0
+
+ delta_pt_up_1 = int(timestamp_end_pt_up_1) - \
+ int(timestamp_begin_pt_up)
+ delta_pt_up_2 = int(timestamp_end_pt_up_2) - \
+ int(timestamp_begin_pt_up)
+ delta_pt_up_3 = int(timestamp_end_pt_up_3) - \
+ int(timestamp_begin_pt_up)
+
+ #TODO: Remove these logs. For test purposes only
+ main.log.info("Delta1: "+str(delta_pt_up_1))
+ main.log.info("Delta2: "+str(delta_pt_up_2))
+ main.log.info("Delta3: "+str(delta_pt_up_3))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.topo b/TestON/tests/TopoPerfNext/TopoPerfNext.topo
index 7d65d18..72fbd07 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.topo
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.topo
@@ -21,8 +21,8 @@
<ONOS1>
<host>10.128.20.11</host>
- <user>sdn</user>
- <password>sdn</password>
+ <user>admin</user>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
@@ -36,11 +36,20 @@
<connect_order>4</connect_order>
<COMPONENTS>
<arg1> --custom topo-4fan.py </arg1>
- <arg2> --arp --mac</arg2>
- <arg3> --topo mytopo </arg3>
+ <arg2> --arp --mac --topo mytopo</arg2>
+ <arg3> </arg3>
<controller> remote </controller>
</COMPONENTS>
</Mininet1>
+ <Mininet2>
+ <host>10.128.10.90</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>RemoteMininetDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </Mininet2>
+
</COMPONENT>
</TOPOLOGY>