Merge remote-tracking branch 'upstream/master'
diff --git a/scripts/link-hw.sh b/scripts/link-hw.sh
new file mode 100755
index 0000000..129da36
--- /dev/null
+++ b/scripts/link-hw.sh
@@ -0,0 +1,93 @@
+#! /bin/bash
+
+#controller=`hostname`
+switches=`ifconfig -a | grep sw |grep -v eth | awk '{print $1}'`
+
+function host2ip (){
+ ip=`grep $1 /etc/hosts |grep -v "ip6"| awk '{print $1}'`
+ echo $ip
+}
+
+# link.sh 00:00:00:00:ba:5e:ba:11 1 up
+
+if [ $# != 3 ];then
+ echo "usage: $0 <dpid> <port> <up|down>"
+fi
+
+src_dpid="dpid:"`echo $1 | sed s'/://g'`
+src_port=$2
+cmd=$3
+
+if [ "x00:00:00:00:ba:5e:ba:11" == "x$1" ]; then
+ if [ x$cmd == "xup" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.61 $src_port 1
+ elif [ x$cmd == "xdown" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.61 $src_port 0
+ else
+ echo "no cmd"
+ fi
+elif [ "x00:00:00:00:00:00:ba:12" == "x$1" ]; then
+ if [ x$cmd == "xup" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.62 $src_port 1
+ elif [ x$cmd == "xdown" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.62 $src_port 0
+ else
+ echo "no cmd"
+ fi
+elif [ "x00:00:00:00:ba:5e:ba:13" == "x$1" ]; then
+ if [ x$cmd == "xup" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.63 $src_port 1
+ elif [ x$cmd == "xdown" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.63 $src_port 0
+ else
+ echo "no cmd"
+ fi
+elif [ "x00:00:20:4e:7f:51:8a:35" == "x$1" ]; then
+ if [ x$cmd == "xup" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.50 $src_port 1
+ elif [ x$cmd == "xdown" ]; then
+ ~/ONOS/scripts/prontolink.exp 10.128.0.50 $src_port 0
+ else
+ echo "no cmd"
+ fi
+
+elif [ "x00:01:00:16:97:08:9a:46" == "x$1" ]; then
+ if [ x$cmd == "xup" ]; then
+ ~/ONOS/scripts/neclink.exp $src_port no
+ elif [ x$cmd == "xdown" ]; then
+ ~/ONOS/scripts/neclink.exp $src_port
+ else
+ echo "no cmd"
+ fi
+
+
+fi
+
+
+
+#for s in $switches; do
+# dpid=`sudo ovs-ofctl show $s |grep dpid | awk '{print $4}'`
+# if [ "x$dpid" == "x$src_dpid" ]; then
+#
+## intf=`sudo ovs-ofctl show $s |grep addr | awk -v p=$src_port 'BEGIN {pat="^ "p"\("}
+## $0 ~ pat {w=match ($0, /\(.*\)/); if (w) print substr($0, RSTART+1, RLENGTH-2)}'`
+#
+# sudo ovs-ofctl show $s |grep addr | sed 's/[\(\)]/,/g'>/tmp/baz.out
+# intf=`cat /tmp/baz.out | awk -v p=$src_port 'BEGIN {pat="^ "p","}
+# $0 ~ pat {w=match($0, /,.*,/); if (w) print substr($0, RSTART+1, RLENGTH-2)}'`
+#
+# if [ x$intf != "x" ]; then
+# if [ x$cmd == "xup" ]; then
+# echo "sudo ifconfig ${intf} up"
+# sudo ifconfig ${intf} up
+# elif [ x$cmd == "xdown" ]; then
+# echo "sudo ifconfig ${intf} down"
+# sudo ifconfig ${intf} down
+# else
+# echo "sudo ifconfig ${intf}"
+# sudo ifconfig ${intf}
+# fi
+# break
+# fi
+# fi
+#done
diff --git a/scripts/neclink.exp b/scripts/neclink.exp
new file mode 100755
index 0000000..a09ed11
--- /dev/null
+++ b/scripts/neclink.exp
@@ -0,0 +1,28 @@
+#!/usr/bin/expect -f
+# ./neclink.exp <ip of port> <'no' or blank>
+set timeout -1
+set port [lindex $argv 0]
+set no [lindex $argv 1]
+
+spawn ssh ons@10.128.0.11
+expect ": "
+send "onos_test\r"
+expect ">"
+send "enable\r"
+expect ":"
+send "onos_test\r"
+expect "#"
+send "configure\r"
+expect "(config)# "
+send "interface gigabitethernet 0/$port\r"
+expect "if)# "
+send "$no shutdown\r"
+expect "# "
+send "exit\r"
+expect "# "
+send "exit\r"
+expect ": "
+send "y\r"
+expect "#"
+send "exit\r"
+expect "closed."
diff --git a/scripts/prontolink.exp b/scripts/prontolink.exp
new file mode 100755
index 0000000..7786701
--- /dev/null
+++ b/scripts/prontolink.exp
@@ -0,0 +1,19 @@
+#!/usr/bin/expect -f
+# ./prontolink.exp <ip of switch> <port> <0 or 1 (on or off)>
+set timeout -1
+set arg0 [lindex $argv 0]
+set port [lindex $argv 1]
+set onoff [lindex $argv 2]
+
+spawn ssh root@$arg0
+expect ": "
+send "OpenFlow\r"
+expect "# "
+send "cli\r"
+expect "CLI# "
+send "port set $port enable=$onoff\r"
+expect "CLI# "
+send "quit\r"
+expect "# "
+send "exit\r"
+expect "closed."
diff --git a/web/ons-demo/data/configuration.json.dev b/web/ons-demo/data/configuration.json.dev
index c2a2e6b..829fa11 100644
--- a/web/ons-demo/data/configuration.json.dev
+++ b/web/ons-demo/data/configuration.json.dev
@@ -18,27 +18,27 @@
],
"association": {
"00:00:00:00:00:00:01:01": [
- "00:00:00:00:00:00:07:01"
+ "00:00:00:00:00:00:08:01"
],
"00:00:00:00:00:00:01:02": [
- "00:00:00:00:00:00:06:01"
+ "00:00:00:00:00:00:02:01"
],
"00:00:00:00:00:00:01:03": [
"00:00:00:00:00:00:03:01"
],
"00:00:00:00:00:00:01:04": [
- "00:00:00:00:00:00:08:01"
- ],
- "00:00:00:00:00:00:01:05": [
- "00:00:00:00:00:00:02:01"
- ],
- "00:00:00:00:00:00:01:06": [
"00:00:00:00:00:00:04:01",
"00:00:00:00:00:00:05:01"
+ ],
+ "00:00:00:00:00:00:01:05": [
+ "00:00:00:00:00:00:06:01"
+ ],
+ "00:00:00:00:00:00:01:06": [
+ "00:00:00:00:00:00:07:01"
]
},
"geo": {
- "00:00:00:00:00:00:01:01": {
+ "00:00:00:00:00:00:01:03": {
"lat": 33.758599,
"lng": -84.387360,
"label": "ATL",
@@ -50,7 +50,7 @@
"label": "DC",
"fanOutAngle": 45
},
- "00:00:00:00:00:00:01:03": {
+ "00:00:00:00:00:00:01:06": {
"lat": 41.891033,
"lng": -87.628326,
"label": "CHI",
@@ -68,11 +68,11 @@
"label": "SEA",
"fanOutAngle": 270
},
- "00:00:00:00:00:00:01:06": {
+ "00:00:00:00:00:00:01:01": {
"lat": 41.225925,
"lng": -74.00528,
"label": "NYC",
"fanOutAngle": 135
}
}
-}
\ No newline at end of file
+}