Test: Support for ONOS cluster mode startup with --onos-instances option to cord-test.py setup.
Changes to igmpTest to do a rover join test with support for parallel test runs across multiple containers.
Change-Id: If9c01df4c2ff5f2f6961eef9ff6fa865abb29b53
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 6b995ec..df0e26d 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -107,7 +107,7 @@
return
CordTester.switch_on_olt = True
ovs_cmd += ' {0}'.format(self.ctlr_ip)
- print('Starting OVS on the host')
+ print('Starting OVS on the host with controller: %s' %(self.ctlr_ip))
else:
print('Starting OVS on test container %s' %self.name)
self.execute_switch(ovs_cmd)
@@ -457,6 +457,9 @@
args.keep = True
port_num = 0
num_tests = len(tests_parallel)
+ if num_tests > 0 and num_tests < args.num_containers:
+ tests_parallel *= args.num_containers/num_tests
+ num_tests = len(tests_parallel)
tests_per_container = max(1, num_tests/args.num_containers)
test_slice_start = 0
test_slice_end = test_slice_start + tests_per_container
@@ -591,11 +594,26 @@
Onos.IMAGE = onos_cnt['image']
Onos.PREFIX = args.prefix
Onos.TAG = onos_cnt['tag']
+ cluster_mode = True if args.onos_instances > 1 else False
+ onos = None
if onos_ip is None:
- onos = Onos(image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60)
+ onos = Onos(image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode)
onos_ip = onos.ip()
- print('Onos IP %s' %onos_ip)
+ num_onos_instances = args.onos_instances
+ onos_ips = [ onos_ip ]
+ if num_onos_instances > 1 and onos is not None:
+ onos_instances = []
+ onos_instances.append(onos)
+ for i in range(1, num_onos_instances):
+ name = '{}-{}'.format(Onos.NAME, i+1)
+ onos = Onos(name = name, image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode)
+ onos_instances.append(onos)
+ onos_ips.append(onos.ipaddr)
+ Onos.setup_cluster(onos_instances)
+
+ ctlr_addr = ','.join(onos_ips)
+ print('Onos IP %s' %ctlr_addr)
if use_manifest or args.test_controller:
print('Installing ONOS cord apps')
try:
@@ -604,7 +622,8 @@
print('Installing cord tester ONOS app %s' %onos_app_file)
try:
- OnosCtrl.install_app(args.app, onos_ip = onos_ip)
+ for ip in onos_ips:
+ OnosCtrl.install_app(args.app, onos_ip = ip)
except: pass
##Start Radius container if not started
@@ -634,7 +653,7 @@
#provision the test container
if not args.dont_provision:
- test_cnt_env = { 'ONOS_CONTROLLER_IP' : onos_ip,
+ test_cnt_env = { 'ONOS_CONTROLLER_IP' : ctlr_addr,
'ONOS_AAA_IP' : radius_ip,
'QUAGGA_IP': ip,
'CORD_TEST_HOST' : ip,
@@ -652,7 +671,7 @@
test_cnt_env['OLT_CONFIG'] = olt_conf_test_loc
test_cnt = CordTester((),
- ctlr_ip = onos_ip,
+ ctlr_ip = ctlr_addr,
image = nose_cnt['image'],
prefix = Container.IMAGE_PREFIX,
tag = nose_cnt['tag'],
@@ -677,6 +696,7 @@
return 0
def cleanupTests(args):
+ image_name = args.onos
prefix = args.prefix
if prefix:
prefix += '/'
@@ -686,6 +706,13 @@
if args.olt:
print('Cleaning up test container OLT configuration')
CordTester.cleanup_intfs()
+
+ onos_list = [ c['Names'][0][1:] for c in Container.dckr.containers() if c['Image'] == image_name ]
+ if len(onos_list) > 1:
+ for onos in onos_list:
+ Container.dckr.kill(onos)
+ Container.dckr.remove_container(onos, force=True)
+
return 0
def listTests(args):
@@ -866,6 +893,8 @@
parser_setup.add_argument('-p', '--prefix', default='', type=str, help='Provide container image prefix')
parser_setup.add_argument('-i', '--identity-file', default=identity_file_default,
type=str, help='ssh identity file to access compute nodes from test container')
+ parser_setup.add_argument('-n', '--onos-instances', default=1, type=int,
+ help='Specify number of test onos instances to spawn')
parser_setup.set_defaults(func=setupCordTester)
parser_list = subparser.add_parser('list', help='List test cases')
@@ -893,6 +922,8 @@
parser_cleanup = subparser.add_parser('cleanup', help='Cleanup test containers')
parser_cleanup.add_argument('-p', '--prefix', default='', type=str, help='Provide container image prefix')
parser_cleanup.add_argument('-l', '--olt', action = 'store_true', help = 'Cleanup OLT config')
+ parser_cleanup.add_argument('-o', '--onos', default=onos_image_default, type=str,
+ help='ONOS container image to cleanup')
parser_cleanup.set_defaults(func=cleanupTests)
c = Client(**(kwargs_from_env()))
diff --git a/src/test/setup/of-bridge-local.sh b/src/test/setup/of-bridge-local.sh
index 5bd3ba7..6abfae6 100755
--- a/src/test/setup/of-bridge-local.sh
+++ b/src/test/setup/of-bridge-local.sh
@@ -5,7 +5,7 @@
bridge="ovsbr0"
fi
if [ x"$controller" = "x" ]; then
- controller=$ONOS_CONTROLLER_IP
+ controller="$ONOS_CONTROLLER_IP"
fi
pkill -9 ofdatapath
pkill -9 ofprotocol
@@ -13,9 +13,11 @@
echo "Configuring ovs bridge $bridge"
ovs-vsctl del-br $bridge
ovs-vsctl add-br $bridge
-my_ip=`ifconfig docker0 | grep "inet addr" | tr -s ' ' | cut -d":" -f2 |cut -d" " -f1`
-#ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
-ovs-vsctl set-controller $bridge tcp:$controller:6653
+ctlr=""
+for ip in `echo $controller | tr ',' '\n'`; do
+ ctlr="$ctlr tcp:$ip:6653"
+done
+ovs-vsctl set-controller $bridge $ctlr
ovs-vsctl set controller $bridge max_backoff=1000
ovs-vsctl set bridge $bridge protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13
ovs-vsctl show
diff --git a/src/test/setup/of-bridge.sh b/src/test/setup/of-bridge.sh
index 2957160..609756a 100755
--- a/src/test/setup/of-bridge.sh
+++ b/src/test/setup/of-bridge.sh
@@ -5,7 +5,7 @@
bridge="ovsbr0"
fi
if [ x"$controller" = "x" ]; then
- controller=$ONOS_CONTROLLER_IP
+ controller="$ONOS_CONTROLLER_IP"
fi
pkill -9 ofdatapath
pkill -9 ofprotocol
@@ -28,9 +28,11 @@
for i in $(seq 1 2 $ports); do
ovs-vsctl add-port $bridge veth$i
done
-my_ip=`ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d":" -f2 |cut -d" " -f1`
-#ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
-ovs-vsctl set-controller $bridge tcp:$controller:6653
+ctlr=""
+for ip in `echo $controller | tr ',' '\n'`; do
+ ctlr="$ctlr tcp:$ip:6653"
+done
+ovs-vsctl set-controller $bridge $ctlr
ovs-vsctl set controller $bridge max_backoff=1000
ovs-vsctl set bridge $bridge protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13
ovs-vsctl show
diff --git a/src/test/setup/onos-form-cluster b/src/test/setup/onos-form-cluster
new file mode 100755
index 0000000..578a443
--- /dev/null
+++ b/src/test/setup/onos-form-cluster
@@ -0,0 +1,41 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Forms ONOS cluster using REST API of each separate instance.
+# -----------------------------------------------------------------------------
+
+[ $# -lt 2 ] && echo "usage: $(basename $0) ip1 ip2..." && exit 1
+
+# Scan arguments for user/password or other options...
+while getopts u:p: o; do
+ case "$o" in
+ u) user=$OPTARG;;
+ p) password=$OPTARG;;
+ esac
+done
+ONOS_WEB_USER=${ONOS_WEB_USER:-onos} # ONOS WEB User defaults to 'onos'
+ONOS_WEB_PASS=${ONOS_WEB_PASS:-rocks} # ONOS WEB Password defaults to 'rocks'
+user=${user:-$ONOS_WEB_USER}
+password=${password:-$ONOS_WEB_PASS}
+let OPC=$OPTIND-1
+shift $OPC
+
+ip=$1
+shift
+nodes=$*
+
+ipPrefix=${ip%.*}
+
+aux=/tmp/${ipPrefix}.cluster.json
+trap "rm -f $aux" EXIT
+
+echo "{ \"nodes\": [ { \"ip\": \"$ip\" }" > $aux
+for node in $nodes; do
+ echo ", { \"ip\": \"$node\" }" >> $aux
+done
+echo "], \"ipPrefix\": \"$ipPrefix.*\" }" >> $aux
+
+for node in $ip $nodes; do
+ echo "Forming cluster on $node..."
+ curl --user $user:$password -X POST \
+ http://$node:8181/onos/v1/cluster/configuration -d @$aux
+done
diff --git a/src/test/setup/radius-config/freeradius/clients.conf b/src/test/setup/radius-config/freeradius/clients.conf
index 1786abe..be2369e 100644
--- a/src/test/setup/radius-config/freeradius/clients.conf
+++ b/src/test/setup/radius-config/freeradius/clients.conf
@@ -1374,6 +1374,27 @@
ipv6addr = ::
secret = radius_password
}
+client 0.0.0.0/0{
+ secret = radius_password
+}
+client ipv6{
+ ipv6addr = ::
+ secret = radius_password
+}
+client 0.0.0.0/0{
+ secret = radius_password
+}
+client ipv6{
+ ipv6addr = ::
+ secret = radius_password
+}
+client 0.0.0.0/0{
+ secret = radius_password
+}
+client ipv6{
+ ipv6addr = ::
+ secret = radius_password
+}
client localhost {
# Allowed values are:
# dotted quad (1.2.3.4)
diff --git a/src/test/setup/radius-config/freeradius/mods-available/sql b/src/test/setup/radius-config/freeradius/mods-available/sql
index 4273142..93e85c1 100644
--- a/src/test/setup/radius-config/freeradius/mods-available/sql
+++ b/src/test/setup/radius-config/freeradius/mods-available/sql
@@ -813,6 +813,18 @@
sqlite {
filename = "/opt/db/radius.sqlite3"
}
+
+ sqlite {
+ filename = "/opt/db/radius.sqlite3"
+ }
+
+ sqlite {
+ filename = "/opt/db/radius.sqlite3"
+ }
+
+ sqlite {
+ filename = "/opt/db/radius.sqlite3"
+ }
#
# Several drivers accept specific options, to set them, a