홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
a25cda29 1 parent 5fa651ee

Removed defunct cell definitions 

 Moved implementation of the cell command into a script.

Change-Id: Iee307d1deca5d91fb0bdb548f67a7276bcf82f22
Inline Side-by-side
Showing 9 changed files with 49 additions and 125 deletions
......@@ -106,57 +106,7 @@ function setPrimaryInstance {
# ON.Lab shared test cell warden address
export CELL_WARDEN="10.254.1.19"
# Applies the settings in the specified cell file or lists current cell definition
# if no cell file is given.
function cell {
cell=$1
case "$cell" in
"borrow")
aux="/tmp/cell-$$"
curl -sS -X POST "http://$CELL_WARDEN:4321/?duration=${2:-0}&user=${3:-$(id -un)}" \
-d "$(cat ~/.ssh/id_rsa.pub)" > $aux
. $aux
rm -f $aux
export ONOS_INSTANCES=$(env | grep 'OC[0-9]*=' | sort | cut -d= -f2)
setPrimaryInstance 1 >/dev/null
onos-verify-cell
;;
"return")
curl -sS -X DELETE "http://$CELL_WARDEN:4321/?user=${2:-$(id -un)}"
unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES
unset OCI OCN OCT ONOS_INSTANCES ONOS_FEATURES
unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p')
;;
"status")
curl -sS "http://$CELL_WARDEN:4321/" | sort
;;
"")
env | egrep "ONOS_CELL"
env | egrep "OCI"
env | egrep "OC[0-9]+" | sort
env | egrep "OC[NT]"
env | egrep "ONOS_" | egrep -v 'ONOS_ROOT|ONOS_CELL|ONOS_INSTANCES' | sort
;;
*)
[ ! -f $ONOS_ROOT/tools/test/cells/$1 ] && \
echo "No such cell: $1" >&2 && return 1
unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES
unset OCI OCN OCT ONOS_INSTANCES ONOS_FEATURES
unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p')
export ONOS_USER=${ONOS_USER:-sdn}
export ONOS_GROUP=${ONOS_GROUP:-sdn}
export ONOS_WEB_USER=onos
export ONOS_WEB_PASS=rocks
export ONOS_CELL=$1
. $ONOS_ROOT/tools/test/cells/$1
export ONOS_INSTANCES=$(env | grep 'OC[0-9]*=' | sort | cut -d= -f2)
setPrimaryInstance 1 >/dev/null
cell
esac
}
alias cell='onos-cell'
[ -n "$ONOS_CELL" -a "$ONOS_CELL" != "borrow" ] && cell $ONOS_CELL > /dev/null
......
#!/bin/bash
# -----------------------------------------------------------------------------
# List available ONOS cells configuration.
# Applies the settings in the specified cell file or lists current cell
# definition if no cell file is given.
# -----------------------------------------------------------------------------
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/dev/bash_profile
cell=$1
case "$cell" in
"borrow")
aux="/tmp/cell-$$"
curl -sS -X POST "http://$CELL_WARDEN:4321/?duration=${2:-0}&user=${3:-$(id -un)}" \
-d "$(cat ~/.ssh/id_rsa.pub)" > $aux
. $aux
rm -f $aux
export ONOS_INSTANCES=$(env | grep 'OC[0-9]*=' | sort | cut -d= -f2)
setPrimaryInstance 1 >/dev/null
onos-verify-cell
;;
"return")
curl -sS -X DELETE "http://$CELL_WARDEN:4321/?user=${2:-$(id -un)}"
unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES
unset OCI OCN OCT ONOS_INSTANCES ONOS_FEATURES
unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p')
;;
cell "$@"
\ No newline at end of file
"status")
curl -sS "http://$CELL_WARDEN:4321/" | sort
;;
"")
env | egrep "ONOS_CELL"
env | egrep "OCI"
env | egrep "OC[0-9]+" | sort
env | egrep "OC[NT]"
env | egrep "ONOS_" | egrep -v 'ONOS_ROOT|ONOS_CELL|ONOS_INSTANCES' | sort
;;
*)
[ ! -f $ONOS_ROOT/tools/test/cells/$1 ] && \
echo "No such cell: $1" >&2 && return 1
unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES
unset OCI OCN OCT ONOS_INSTANCES ONOS_FEATURES
unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p')
export ONOS_USER=${ONOS_USER:-sdn}
export ONOS_GROUP=${ONOS_GROUP:-sdn}
export ONOS_WEB_USER=onos
export ONOS_WEB_PASS=rocks
export ONOS_CELL=$1
. $ONOS_ROOT/tools/test/cells/$1
export ONOS_INSTANCES=$(env | grep 'OC[0-9]*=' | sort | cut -d= -f2)
setPrimaryInstance 1 >/dev/null
cell
esac
\ No newline at end of file
......
# Andrea's ProxMox ONOS instances 1,2,3 & ONOS mininet box
export ONOS_NIC="10.128.12.*"
export OC1="10.128.12.11"
export OC2="10.128.12.12"
export OC3="10.128.12.13"
export OCN="10.128.12.14"
export OCT=$OC1
export ONOS_USE_SSH=true
export ONOS_APPS=drivers,openflow,proxyarp,ovsdb,pathpainter
\ No newline at end of file
export ONOS_NIC=192.168.1.*
export OC1="192.168.1.11"
export OC2="192.168.1.12"
export OC3="192.168.1.13"
export OC4="192.168.1.14"
# export OC5="192.168.1.15"
export OCN="192.168.1.15"
export OCI="${OC1}"
# Brians's ProxMox ONOS instances 1,2,3 & ONOS mininet box
export ONOS_NIC="10.128.3.*"
export OC1="10.128.3.1"
export OC2="10.128.3.2"
export OC3="10.128.3.3"
export OCN="10.128.3.4"
export OCT=$OC1
export ONOS_USE_SSH=true
export ONOS_APPS=drivers,openflow,proxyarp,mobility,pathpainter
# Jian's ProxMox ONOS instances 1,2,3 & ONOS mining box
export ONOS_NIC="10.128.1.*"
export OC1="10.128.1.1"
export OC2="10.128.1.2"
export OC3="10.128.1.3"
export OCN="10.128.1.4"
export OCT=$OC1
export ONOS_USE_SSH=true
export ONOS_APPS=drivers,openflow,proxyarp,mobility
\ No newline at end of file
# Madan's ProxMox ONOS instances 1,2,3 & ONOS mininet box
export ONOS_NIC="10.128.4.*"
export OC1="10.128.4.2"
export OC2="10.128.4.3"
export OC3="10.128.4.4"
export OCN="10.128.4.5"
# Simon's ProxMox ONOS instances 1,2,3 & ONOS mininet box
export ONOS_NIC="10.128.2.*"
export OC1="10.128.2.1"
export OC2="10.128.2.2"
export OC3="10.128.2.3"
export OCN="10.128.2.4"
export OCT=$OC1
export ONOS_USE_SSH=true
export ONOS_APPS=drivers,openflow,proxyarp,mobility
\ No newline at end of file
# Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box
export ONOS_NIC=192.168.56.*
export OC1="192.168.56.5"
export OC2="192.168.56.6"
export OC3="192.168.56.7"
export OCN="192.168.56.8"
#export OCN="10.128.11.4"
export ONOS_USE_SSH=true
export ONOS_APPS=drivers,openflow,proxyarp,mobility,pathpainter
\ No newline at end of file