Added json object support in intents function
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 5573ee5..b5faab1 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -837,22 +837,32 @@
main.cleanup()
main.exit()
- def intents(self):
+ def intents(self, json_format = False):
'''
+ Optional:
+ * json_format: enable output formatting in json
Description:
Obtain intents currently installed
'''
try:
- self.handle.sendline("")
- self.handle.expect("onos>")
+ if json_format:
+ self.handle.sendline("intents -j")
+ self.handle.expect("intents -j")
+ self.handle.expect("onos>")
- self.handle.sendline("intents")
- self.handle.expect("onos>")
+ handle = self.handle.before
- self.handle.sendline("")
- self.handle.expect("onos>")
+ else:
+ self.handle.sendline("")
+ self.handle.expect("onos>")
- handle = self.handle.before
+ self.handle.sendline("intents")
+ self.handle.expect("onos>")
+
+ self.handle.sendline("")
+ self.handle.expect("onos>")
+
+ handle = self.handle.before
return handle