commit 6e70e14dfa0be6e679c333363042c0fe39dc7c76
author A R Karthick <kramanar@ciena.com> Fri Jul 28 15:25:38 2017 -0700
committer A R Karthick <kramanar@ciena.com> Fri Jul 28 15:27:10 2017 -0700
tree 8235f8ad7f43d9db7a601386fddbacdb3c837196
parent b006b8acb789b141184b77a1267af08ddeb66a90

Reactivate CORD/ONOS apps used by cord-tester after reactivating drivers app.
Since reactivation of drivers app seems to result in apps losing reference to netcfg service.
AAA app hits an exception in config update after reactivating org.onosproject.drivers.

Change-Id: Icac6c5c9f73e35677861d1e7c1789baa89c0ab4a

src/test/utils/VolthaCtrl.py

diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index fe2761c..2702b9a 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -143,6 +143,7 @@
     UPLINK_VLAN_MAP = { 'of:0000000000000001' : '222' }
     REST_PORT = 8881
     HOST = '172.17.0.1'
+    ONOS_APPS = ('org.onosproject.dhcp', 'org.onosproject.dhcp-relay', 'org.ciena.cordigmp')
 
     def __init__(self, host = HOST, rest_port = REST_PORT, uplink_vlan_map = UPLINK_VLAN_MAP, uplink_vlan_start = UPLINK_VLAN_START):
         self.host = host
@@ -201,10 +202,13 @@
             OnosCtrl('org.onosproject.drivers').deactivate()
             OnosCtrl('org.onosproject.openflow-base').deactivate()
             OnosCtrl.config(device_config)
-            time.sleep(2)
+            time.sleep(10)
             OnosCtrl('org.onosproject.drivers').activate()
             OnosCtrl('org.onosproject.openflow-base').activate()
             time.sleep(5)
+            log.info('Reactivating CORD and ONOS apps')
+            Onos.activate_cord_apps(deactivate = True)
+            Onos.activate_apps(self.ONOS_APPS, deactivate = True)
 
         return self.switch_map