Commit 2c7a1b40 authored by Harry Jiang's avatar Harry Jiang

some variables are updated

parent a320a7db
......@@ -116,7 +116,7 @@ class Controller(object):
json = parameters[7]
ports = parameters[8:]
else:
json = '/home/' + getpass.getuser() + '/hp4plus/hp4/hp4.json'
json = '/home/' + getpass.getuser() + '/hp4plus/hp4plus/hp4.json'
hjp_check = Path('centralcontroller/hp4_json_path')
if hjp_check.is_file():
with open('centralcontroller/hp4_json_path', 'r') as hjp:
......
......@@ -5,7 +5,7 @@ then
echo "configuring controller for cloudlab execution"
printf "#!/bin/bash\n\n" > tests/ssh_vals.sh
printf "user=$1\n" >> tests/ssh_vals.sh
echo "/opt/hp4plus/hp4/hp4.json" > centralcontroller/hp4_json_path
echo "/opt/hp4plus/hp4plus/hp4.json" > centralcontroller/hp4_json_path
if [[ $# -gt 1 ]]
then
printf "nodes=( $2 $3 $4 $5 $6 $7 $8 $9 ${10} ${11} ${12} )\n" >> tests/ssh_vals.sh
......
......@@ -6,7 +6,7 @@ cd ~/controller/tests
----- HP4
WINDOW - MININET
cd ~/hp4plus/hp4
cd ~/hp4plus/hp4plus
./run.sh --commands hp4commands.txt --topo ~/controller/tests/t01/topo.txt
WINDOW - HP4CONTROLLER
......
......@@ -6,7 +6,7 @@ cd ~/controller/tests
----- HP4
WINDOW - MININET
cd ~/hp4plus/hp4
cd ~/hp4plus/hp4plus
./run.sh --commands hp4commands.txt --topo ~/controller/tests/t02/topo.txt
mininet> source /home/ubuntu/controller/tests/t02/t02_mininet
......
......@@ -15,7 +15,7 @@ cd ~/controller/tests
----- HP4plus
WINDOW - MININET
cd ~/hp4plus/hp4
cd ~/hp4plus/hp4plus
./run.sh --commands hp4commands.txt --scenario arp --topo ~/controller/tests/t03/topo.txt --seed 32
WINDOW - HP4CONTROLLER
......
#!/bin/bash
cd /home/ubuntu/hp4plus/hp4
cd /home/ubuntu/hp4plus/hp4plus
gnome-terminal --window-with-profile=mininet --geometry=80x20+0+0 --command="bash -c \"tty > /tmp/pts_mininet; exec bash\"" &
sleep 0.2
cd /home/ubuntu/controller
......@@ -8,7 +8,7 @@ gnome-terminal --window-with-profile=controller --geometry=90x30+800+0 --command
sleep 0.2
gnome-terminal --window-with-profile=admin --geometry=80x20+0+415 --command="bash -c \"tty > /tmp/pts_admin; exec bash\"" &
sleep 0.2
cd /home/ubuntu/hp4plus/hp4
cd /home/ubuntu/hp4plus/hp4plus
gnome-terminal --window-with-profile=bmv2_CLI --geometry=80x20+0+805 --command="bash -c \"tty > /tmp/pts_bmv2_cli; exec bash\"" &
sleep 0.2
cd /home/ubuntu/controller
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment