commit cf1a5d32f3683e119933843757532f4804ba899e
author A R Karthick <kramanar@ciena.com> Thu Oct 05 16:04:43 2017 -0700
committer A R Karthick <kramanar@ciena.com> Thu Oct 05 16:04:43 2017 -0700
tree 1e2f0566d6d259e5b95d0e6f591c185fe6ef6e62
parent 760d138e50aa3f5924c52a096087965614914a01

Also activate hostprovider onos app during onos restart

Change-Id: I4c41a5f75b5aed76ebdb46f0447dd2b9bf280918

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 98a8a7a..572ef16 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -614,7 +614,7 @@
     JAVA_OPTS_FORMAT = '-Xms{} -Xmx{} -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode'
     JAVA_OPTS_DEFAULT = JAVA_OPTS_FORMAT.format(*SYSTEM_MEMORY) #-XX:+PrintGCDetails -XX:+PrintGCTimeStamps'
     JAVA_OPTS_CLUSTER_DEFAULT = JAVA_OPTS_FORMAT.format(*INSTANCE_MEMORY)
-    env = { 'ONOS_APPS' : 'drivers,openflow,proxyarp,vrouter', 'JAVA_OPTS' : JAVA_OPTS_DEFAULT }
+    env = { 'ONOS_APPS' : 'drivers,openflow,proxyarp,vrouter,hostprovider', 'JAVA_OPTS' : JAVA_OPTS_DEFAULT }
     onos_cord_apps = ( ['cord-config', '1.2-SNAPSHOT', 'org.opencord.config'],
                        ['sadis-app', '3.0-SNAPSHOT', 'org.opencord.sadis'],
                        ['olt-app', '1.2-SNAPSHOT', 'org.onosproject.olt'],

src/test/utils/VolthaCtrl.py

diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index 91969c6..d1ee967 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -213,7 +213,7 @@
     UPLINK_VLAN_MAP = { 'of:0000000000000001' : '222' }
     REST_PORT = 8882
     HOST = '172.17.0.1'
-    ONOS_APPS = ('org.onosproject.dhcp', 'org.onosproject.dhcp-relay', 'org.ciena.cordigmp')
+    ONOS_APPS = ('org.onosproject.hostprovider', 'org.onosproject.dhcp', 'org.onosproject.dhcp-relay', 'org.ciena.cordigmp')
     ADMIN_STATE = 'admin_state'
     OPER_STATUS = 'oper_status'
     CONNECT_STATUS = 'connect_status'