Fix url for jenkins plots and minor driver cleanup
Change-Id: I2528786df322fff3a88cb6e912b3ea1ce5555cd5
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 5201570..e15ec40 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -1802,14 +1802,13 @@
def intents( self, jsonFormat = True, summary = False, **intentargs):
"""
- Optional:
- * jsonFormat: enable output formatting in json
- * summary: whether only output the intent summary
- * type: only output a certain type of intent
- This options is valid only when jsonFormat is true and summary is
- true
Description:
- Obtain intents
+ Obtain intents from the ONOS cli.
+ Optional:
+ * jsonFormat: Enable output formatting in json, default to True
+ * summary: Whether only output the intent summary, defaults to False
+ * type: Only output a certain type of intent. This options is valid
+ only when jsonFormat is True and summary is True.
"""
try:
cmdStr = "intents"
@@ -1820,19 +1819,20 @@
handle = self.sendline( cmdStr )
args = utilities.parse_args( [ "TYPE" ], **intentargs )
if "TYPE" in args.keys():
- type = args[ "TYPE" ]
+ intentType = args[ "TYPE" ]
else:
- type = ""
- if jsonFormat and summary and ( type != "" ):
+ intentType = ""
+ # IF we want the summary of a specific intent type
+ if jsonFormat and summary and ( intentType != "" ):
jsonResult = json.loads( handle )
- if type in jsonResult.keys():
- return jsonResult[ type ]
+ if intentType in jsonResult.keys():
+ return jsonResult[ intentType ]
else:
- main.log.error( "unknown TYPE, return all types of intents" )
+ main.log.error( "unknown TYPE, returning all types of intents" )
return handle
else:
+ main.log.error( handle )
return handle
-
except TypeError:
main.log.exception( self.name + ": Object not as expected" )
return None
@@ -1846,7 +1846,6 @@
main.cleanup()
main.exit()
-
def getIntentState(self, intentsId, intentsJson=None):
"""
Check intent state.
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index b526a99..ed6e538 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -359,8 +359,6 @@
"""
try:
- # main.log.info( self.name + ": Stopping ONOS" )
- # self.stop()
self.handle.sendline( "cd " + self.home )
self.handle.expect( self.home + "\$" )
cmd = "git pull"
@@ -384,10 +382,6 @@
'Please, commit your changes before you can merge.',
pexpect.TIMEOUT ],
timeout=300 )
- # debug
- # main.log.report( self.name +": DEBUG: \n"+
- # "git pull response: " +
- # str( self.handle.before ) + str( self.handle.after ) )
if i == 0:
main.log.error( self.name + ": Git pull had some issue" )
output = self.handle.after
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 567e06c..58b113c 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -182,7 +182,7 @@
# index = The number of the graph under plot name
job = "HAclusterRestart"
plotName = "Plot-HA"
- index = "0"
+ index = "1"
graphs = '<ac:structured-macro ac:name="html">\n'
graphs += '<ac:plain-text-body><![CDATA[\n'
graphs += '<iframe src="https://onos-jenkins.onlab.us/job/' + job +\
diff --git a/TestON/tests/HAkillNodes/HAkillNodes.py b/TestON/tests/HAkillNodes/HAkillNodes.py
index 7af4f13..d31cd30 100644
--- a/TestON/tests/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HAkillNodes/HAkillNodes.py
@@ -187,7 +187,7 @@
# index = The number of the graph under plot name
job = "HAkillNodes"
plotName = "Plot-HA"
- index = "0"
+ index = "1"
graphs = '<ac:structured-macro ac:name="html">\n'
graphs += '<ac:plain-text-body><![CDATA[\n'
graphs += '<iframe src="https://onos-jenkins.onlab.us/job/' + job +\
diff --git a/TestON/tests/HAsanity/HAsanity.py b/TestON/tests/HAsanity/HAsanity.py
index bffdd9e..ed37e33 100644
--- a/TestON/tests/HAsanity/HAsanity.py
+++ b/TestON/tests/HAsanity/HAsanity.py
@@ -178,7 +178,7 @@
# index = The number of the graph under plot name
job = "HAsanity"
plotName = "Plot-HA"
- index = "0"
+ index = "1"
graphs = '<ac:structured-macro ac:name="html">\n'
graphs += '<ac:plain-text-body><![CDATA[\n'
graphs += '<iframe src="https://onos-jenkins.onlab.us/job/' + job +\
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index a6b4592..2f7f922 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -159,7 +159,7 @@
# index = The number of the graph under plot name
job = "HAsingleInstanceRestart"
plotName = "Plot-HA"
- index = "0"
+ index = "1"
graphs = '<ac:structured-macro ac:name="html">\n'
graphs += '<ac:plain-text-body><![CDATA[\n'
graphs += '<iframe src="https://onos-jenkins.onlab.us/job/' + job +\
diff --git a/TestON/tests/HAstopNodes/HAstopNodes.py b/TestON/tests/HAstopNodes/HAstopNodes.py
index b87af44..b7f1e77 100644
--- a/TestON/tests/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HAstopNodes/HAstopNodes.py
@@ -180,7 +180,7 @@
# index = The number of the graph under plot name
job = "HAstopNodes"
plotName = "Plot-HA"
- index = "0"
+ index = "1"
graphs = '<ac:structured-macro ac:name="html">\n'
graphs += '<ac:plain-text-body><![CDATA[\n'
graphs += '<iframe src="https://onos-jenkins.onlab.us/job/' + job +\