commit aa859b2a4e58ac95b3754c1c3c498d9971afec0d
author A.R Karthick <kramanar@ciena.com> Mon Jun 12 14:50:35 2017 -0700
committer A.R Karthick <kramanar@ciena.com> Mon Jun 12 14:51:38 2017 -0700
tree b116d27f5ea8c27f873453e551b332149d759f0d
parent b6fc1b5f8147e7203ba6ea9a48b85f3d4917e38e

Don't deactivate/activate in tls test callback as its not multi-subscriber/thread safe.
Deactivate/activate in setup class.
Increase tls recv timeout.

Change-Id: I4159760d19b532fdfca2dbc9fe3cc7d9130df73e

src/test/cordSubscriber/cordSubscriberTest.py

diff --git a/src/test/cordSubscriber/cordSubscriberTest.py b/src/test/cordSubscriber/cordSubscriberTest.py
index db6bbe1..453a505 100644
--- a/src/test/cordSubscriber/cordSubscriberTest.py
+++ b/src/test/cordSubscriber/cordSubscriberTest.py
@@ -333,7 +333,7 @@
           cls.num_ports = cls.port_map['num_ports']
           if cls.num_ports > 1:
                 cls.num_ports -= 1 ##account for the tx port
-          cls.activate_apps(cls.apps + cls.olt_apps)
+          cls.activate_apps(cls.apps + cls.olt_apps, deactivate = True)
 
       @classmethod
       def tearDownClass(cls):
@@ -346,9 +346,12 @@
           cls.install_app_igmp()
 
       @classmethod
-      def activate_apps(cls, apps):
+      def activate_apps(cls, apps, deactivate = False):
             for app in apps:
                   onos_ctrl = OnosCtrl(app)
+                  if deactivate is True:
+                        onos_ctrl.deactivate()
+                        time.sleep(2)
                   status, _ = onos_ctrl.activate()
                   assert_equal(status, True)
                   time.sleep(2)
@@ -502,10 +505,10 @@
             def tls_fail_cb():
                   log_test.info('TLS verification failed')
             if subscriber.has_service('TLS'):
-                  OnosCtrl('org.opencord.aaa').deactivate()
-                  time.sleep(2)
-                  OnosCtrl('org.opencord.aaa').activate()
-                  time.sleep(5)
+                  #OnosCtrl('org.opencord.aaa').deactivate()
+                  #time.sleep(2)
+                  #OnosCtrl('org.opencord.aaa').activate()
+                  #time.sleep(5)
                   tls = TLSAuthTest(fail_cb = tls_fail_cb, intf = subscriber.rx_intf)
                   log_test.info('Running subscriber %s tls auth test' %subscriber.name)
                   tls.runTest()

src/test/utils/EapolAAA.py

diff --git a/src/test/utils/EapolAAA.py b/src/test/utils/EapolAAA.py
index a27001a..b2877af 100644
--- a/src/test/utils/EapolAAA.py
+++ b/src/test/utils/EapolAAA.py
@@ -183,7 +183,7 @@
         assert_equal(pkt_type, EAPOL_EAPPACKET)
         return p[4:]
 
-    def eapol_scapy_recv(self, cb = None, lfilter = None, count = 1, timeout = 5):
+    def eapol_scapy_recv(self, cb = None, lfilter = None, count = 1, timeout = 10):
         def eapol_default_cb(pkt): pass
         if cb is None:
             cb = eapol_default_cb