commit 928ad6287fe2575f51c4f1ef1c85c2e4850de123
author A R Karthick <kramanar@ciena.com> Mon Jan 30 12:18:32 2017 -0800
committer A R Karthick <kramanar@ciena.com> Mon Jan 30 12:18:32 2017 -0800
tree beca42b7dc643cfedd054743bcfb865292b12593
parent f184b349f753d7e1cfb61b7afab796fad958c19e

Fixes for Onos cord instance wrapper restart case.
Add a exception marker for logs with exceptions.

Change-Id: Ic68f15ba777768ab040c89985d7044cdf1867ef7

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 5f1ea2c..d1db4ff 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -352,7 +352,7 @@
             self.start()
 
     def start(self, restart = False, network_cfg = None):
-        if network_cfg:
+        if network_cfg is not None:
             json_data = json.dumps(network_cfg, indent=4)
             with open('{}/network-cfg.json'.format(self.onos_config_dir), 'w') as f:
                 f.write(json_data)

src/test/utils/CordTestServer.py

diff --git a/src/test/utils/CordTestServer.py b/src/test/utils/CordTestServer.py
index 1359850..c302d8c 100644
--- a/src/test/utils/CordTestServer.py
+++ b/src/test/utils/CordTestServer.py
@@ -37,7 +37,7 @@
 
     def __restart_onos(self, node = None, config = None, timeout = 10):
         if self.onos_cord:
-            onos_config = '{}/network-cfg.json'.format(OnosCord.onos_config_dir)
+            onos_config = '{}/network-cfg.json'.format(self.onos_cord.onos_config_dir)
         else:
             onos_config = '{}/network-cfg.json'.format(Onos.host_config_dir)
         if config is None:

src/test/utils/OnosLog.py

diff --git a/src/test/utils/OnosLog.py b/src/test/utils/OnosLog.py
index a5e0fa7..0a31b80 100644
--- a/src/test/utils/OnosLog.py
+++ b/src/test/utils/OnosLog.py
@@ -53,7 +53,9 @@
                         if t == 'Exception':
                             exception_map[t] = lines[i+1:i+1+10]
             output = '\n'.join(match_lines)
-            output += '\n'.join(exception_map['Exception'])
+            if len(exception_map['Exception']) > 0:
+                output += '\nException:\n'
+                output += '\n'.join(exception_map['Exception'])
 
         #update the last snapshot
         if cache_result is True: