commit 1ab66afb123424cafcbc1f1499e9ceb5532c5ed5
author A R Karthick <kramanar@ciena.com> Wed Aug 17 16:57:42 2016 -0700
committer Karthick Ramanarayanan <kramanar@ciena.com> Wed Aug 17 17:00:40 2016 -0700
tree c14c4fd94347c6a3599ad73ad76324898753aa81
parent 6358fb21be2ed3ab0fec1891bed9bccbfe4987ca

Test: Restart ONOS with default network cfg after vrouter/dhcprelay tests are run.
This puts ONOS back to initial state for other tests.

Change-Id: Ib20538399737789c11def76189a77bc651289506

src/test/setup/cord-test.py

diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 31d72ab..4f406e3 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -302,7 +302,7 @@
 
     test_containers = []
     #These tests end up restarting ONOS/quagga/radius
-    tests_exempt = ('vrouter', 'cordSubscriber', 'proxyarp')
+    tests_exempt = ('vrouter', 'cordSubscriber', 'proxyarp', 'dhcprelay')
     if args.test_type.lower() == 'all':
         tests = CordTester.ALL_TESTS
         args.quagga = True
@@ -362,7 +362,7 @@
                      'QUAGGA_IP': test_host,
                      'CORD_TEST_HOST' : test_host,
                      'CORD_TEST_PORT' : test_port,
-                     'ONOS_RESTART_DISABLED' : 1 if args.olt and args.test_controller else 0,
+                     'ONOS_RESTART' : 0 if args.olt and args.test_controller else 1,
                    }
     if args.olt:
         olt_conf_test_loc = os.path.join(CordTester.sandbox_setup, 'olt_config.json')
@@ -398,6 +398,7 @@
         if test_cnt.create and (args.start_switch or not args.olt):
             test_cnt.start_switch()
         if test_cnt.create and test_cnt.olt:
+            print('Test container create with port num: %d' %port_num)
             _, port_num = test_cnt.setup_intfs(port_num = port_num)
 
     thread_pool = ThreadPool(len(test_containers), queue_size = 1, wait_timeout=1)
@@ -504,7 +505,7 @@
                          'QUAGGA_IP': ip,
                          'CORD_TEST_HOST' : ip,
                          'CORD_TEST_PORT' : port,
-                         'ONOS_RESTART_DISABLED' : 1 if args.olt and args.test_controller else 0,
+                         'ONOS_RESTART' : 0 if args.olt and args.test_controller else 1,
                        }
         if args.olt:
             olt_conf_test_loc = os.path.join(CordTester.sandbox_setup, 'olt_config.json')