Skip to content

Commit

Permalink
Change default controller to Ryu in some source files.
Browse files Browse the repository at this point in the history
  * In build.sh and rftest make ryu the default controller.
  * In build.sh and rftest remove POX support.
  • Loading branch information
gizmoguy committed Oct 13, 2014
1 parent b0d75b8 commit 2d66d42
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ usage() {
echo " -o Specify the Open vSwitch version to fetch" \
"(default: $OVS_VERSION)"
echo;
echo "Valid controllers: pox (default), nox, ryu. Multiple may be" \
echo "Valid controllers: nox, ryu. Multiple may be" \
"specified at once."
echo "Controllers must be specified at the end of the command."
echo;
Expand Down
22 changes: 2 additions & 20 deletions rftest/rftest1
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ export PATH=$PATH:/usr/local/bin:/usr/local/sbin
export PYTHONPATH=$PYTHONPATH:$RF_HOME

usage() {
echo "$0 [-hrz] [--pox] [--ryu]"
echo "$0 [-hrz] [--ryu]"
echo "Script Actions:"
echo " --pox: run using POX (default)"
echo " --ryu: run using RYU"
echo " -r, --reset: stop running and clear data from previous executions"
echo
Expand All @@ -33,13 +32,10 @@ usage() {
echo " -z, --zeromq: Use ZeroMQ for IPC instead of MongoDB"
}

ACTION="POX"
ACTION="RYU"
while test $# -gt 0
do
case "$1" in
--pox)
ACTION="RYU"
;;
--ryu)
ACTION="RYU"
;;
Expand Down Expand Up @@ -157,20 +153,6 @@ if [ "$ACTION" != "RESET" ]; then

echo_bold "-> Starting the controller and RFPRoxy..."
case "$ACTION" in
POX)
cd pox
RFSTATS=""
if [ $USE_MONGO -eq 1 ]; then
RFSTATS="rfstats"
echo_bold "-> Enabling RFStats component..."
else
echo_bold "-> Disabling RFStats component..."
fi
./pox.py log.level --=INFO topology openflow.topology \
openflow.discovery rfproxy $RFSTATS &
cd -
PROTOCOLS="OpenFlow10"
;;
RYU)
ryu-manager $RF_HOME/ryu-rfproxy/rfproxy.py &
;;
Expand Down
4 changes: 2 additions & 2 deletions rftest/rftest2
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ EOF
done

echo_bold "-> Starting the controller and RFPRoxy..."
cd pox
./pox.py log.level --=INFO topology openflow.topology openflow.discovery rfproxy rfstats &
cd ryu-rfproxy
ryu-manager rfproxy.py &
cd -
wait_port_listen $CONTROLLER_PORT

Expand Down

0 comments on commit 2d66d42

Please sign in to comment.