commit 4eb90ddec716ced8f16686cf998af99a66cf65c1
author A R Karthick <kramanar@ciena.com> Fri Sep 01 13:46:30 2017 -0700
committer A R Karthick <kramanar@ciena.com> Fri Sep 01 13:46:30 2017 -0700
tree 2384541d48760dc9af04d6fecfadd16d6f1e8162
parent 5c991369927096af000b1ac3a16b623a76cc72ba

Set default vlan for uplink

Change-Id: If37dd39c7e714fe60a0f294ded5a03a5220f6d45

src/test/utils/VolthaCtrl.py

diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index 812467b..615330d 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -273,7 +273,7 @@
             device_config['devices'][device_id]['basic'] = dict(driver='pmc-olt')
             device_config['devices'][device_id]['accessDevice'] = dict(uplink=nni_ports[0]['port'],
                                                                        vlan = uplink_vlan,
-                                                                       defaultVlan='0'
+                                                                       defaultVlan=str(onu_ports[0])
                                                                        )
         if device_id:
             #toggle drivers/openflow base before reconfiguring the driver and olt config data
@@ -283,7 +283,7 @@
             time.sleep(10)
             OnosCtrl('org.onosproject.drivers').activate()
             OnosCtrl('org.onosproject.openflow-base').activate()
-            time.sleep(5)
+            time.sleep(10)
             log.info('Reactivating CORD and ONOS apps')
             Onos.activate_cord_apps(deactivate = True)
             Onos.activate_apps(self.ONOS_APPS, deactivate = True)