commit 0e9cf33e69165fd7f80303638f98e27243ec24fd
author Jon Hall <jhall@onlab.us> Fri Sep 18 18:55:40 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 18 18:55:40 2015 +0000
tree d141e01076f51e264a38cff8fc89d419e370937d
parent e7e0c06fa8bf4581fe5b322a40e5c9d945124b77
parent 6f665651a7a043e8cf2b8f195d1de99768779f7d

Merge "Add missing new line when creating cell file"

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 32aef33..cf2f54a 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -1806,7 +1806,10 @@
                 cmdStr += " -j"
             handle = self.sendline( cmdStr )
             args = utilities.parse_args( [ "TYPE" ], **intentargs )
-            type = args[ "TYPE" ] if args[ "TYPE" ] is not None else ""
+            if "TYPE" in args.keys():
+                type = args[ "TYPE" ]
+            else:
+                type = ""
             if jsonFormat and summary and ( type != "" ):
                 jsonResult = json.loads( handle )
                 if type in jsonResult.keys():

TestON/tests/CHOtest/CHOtest.params

diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index a4fabb0..f7ae88b 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -29,7 +29,7 @@
 
     <CTRL>
         <numCtrl>3</numCtrl>
-        <karafCliTimeout>3600000</karafCliTimeout>
+        <karafCliTimeout>7200000</karafCliTimeout>
     </CTRL>
 
     <TOPO1>