Modified below files for dhcpl2relay setUp functions
Change-Id: I1e115e920688af846474421d76b905060fde8709
diff --git a/src/test/dhcpl2relay/dhcpl2relayTest.py b/src/test/dhcpl2relay/dhcpl2relayTest.py
index e2cceb5..bd98557 100644
--- a/src/test/dhcpl2relay/dhcpl2relayTest.py
+++ b/src/test/dhcpl2relay/dhcpl2relayTest.py
@@ -142,8 +142,8 @@
def tearDown(self):
super(dhcpl2relay_exchange, self).tearDown()
- OnosCtrl.uninstall_app(cls.dhcpl2_app_file)
- OnosCtrl.uninstall_app(cls.sadis_app_file)
+ OnosCtrl.uninstall_app(self.dhcpl2_app_file)
+ OnosCtrl.uninstall_app(self.sadis_app_file)
@classmethod
def tearDownClass(cls):
@@ -155,8 +155,9 @@
OnosCtrl.uninstall_app(cls.dhcpl2_app_file)
OnosCtrl.uninstall_app(cls.sadis_app_file)
cls.onos_ctrl.deactivate()
+ OnosCtrl(cls.app).deactivate()
#cls.dhcpd_stop()
- cls.dhcp_l2_relay_cleanup()
+ #cls.dhcp_l2_relay_cleanup()
@classmethod
def dhcp_l2_relay_setup(cls):
@@ -233,7 +234,7 @@
def cord_l2_relay_load(cls):
OnosCtrl.uninstall_app(cls.dhcpl2_app_file)
#relay_device_map = '{}/{}'.format(cls.relay_device_id, cls.relay_interface_port)
- relay_device_map = "{}/veth42".format(cls.relay_device_id)
+ relay_device_map = "{}/12".format(cls.relay_device_id)
print relay_device_map
dhcp_dict = { "apps" : { "org.opencord.dhcpl2relay" : {"dhcpl2relay" :
{"dhcpserverConnectPoint":[relay_device_map]}