commit 4a2362ca554a18b3f67936e6364874d4753e1954
author A R Karthick <kramanar@ciena.com> Wed Jun 22 17:32:44 2016 -0700
committer A.R Karthick <kramanar@ciena.com> Thu Jun 23 15:15:33 2016 -0700
tree ab477e91ceedad7b63a863c04cc48ed4d512288e
parent 92a0e5a8353f40a5550f3e606b5bb1e485d88acb

Fix: Use the test server rpc/api to stop quagga.

Change-Id: I50fab4d7d5854cf4ccbe9881787a99dd4840b2f6

src/test/utils/CordTestServer.py

diff --git a/src/test/utils/CordTestServer.py b/src/test/utils/CordTestServer.py
index 1889536..299e7c2 100644
--- a/src/test/utils/CordTestServer.py
+++ b/src/test/utils/CordTestServer.py
@@ -67,7 +67,7 @@
 
     def stop_quagga(self):
         quaggaStop = QuaggaStopWrapper()
-        time.sleep(2)
+        time.sleep(5)
         try:
             quagga_config_gen = '{}/testrib_gen.conf'.format(Quagga.host_quagga_config)
             os.unlink(quagga_config_gen)

src/test/vrouter/vrouterTest.py

diff --git a/src/test/vrouter/vrouterTest.py b/src/test/vrouter/vrouterTest.py
index 61fe80c..5666348 100644
--- a/src/test/vrouter/vrouterTest.py
+++ b/src/test/vrouter/vrouterTest.py
@@ -21,7 +21,7 @@
 from OnosFlowCtrl import OnosFlowCtrl, get_mac
 from onosclidriver import OnosCliDriver
 from CordContainer import Container, Onos, Quagga
-from CordTestServer import cord_test_onos_restart, cord_test_quagga_restart
+from CordTestServer import cord_test_onos_restart, cord_test_quagga_restart, cord_test_quagga_stop
 from portmaps import g_subscriber_port_map
 import threading
 import time
@@ -29,13 +29,6 @@
 import json
 log.setLevel('INFO')
 
-class QuaggaStopWrapper(Container):
-
-    def __init__(self, name = 'cord-quagga', image = 'cord-test/quagga', tag = 'latest'):
-        super(QuaggaStopWrapper, self).__init__(name, image, tag = tag)
-        if self.exists():
-            self.kill()
-
 class vrouter_exchange(unittest.TestCase):
 
     apps = ('org.onosproject.vrouter', 'org.onosproject.fwd')
@@ -361,8 +354,7 @@
     def __vrouter_network_verify_negative(self, networks, peers = 1):
         ##Stop quagga. Test traffic again to see if flows were removed
         log.info('Stopping Quagga container')
-        quaggaStop = QuaggaStopWrapper()
-        time.sleep(2)
+        cord_test_quagga_stop()
         if networks <= 10000:
             routes = json.loads(self.cli.routes(jsonFormat = True))
             #Verify routes have been removed