Merge "Intial Folder struecture for the IPv6 Test scripts"
diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index c10079f..8b648b8 100644
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -97,7 +97,7 @@
try:
path = "http://" + str( ip ) + ":" + str( port ) + base + url
if self.user_name and self.pwd:
- main.log.info("users/passwd is: " + self.user_name + "/" + self.pwd)
+ main.log.info("user/passwd is: " + self.user_name + "/" + self.pwd)
auth = (self.user_name, self.pwd)
else:
auth=None
diff --git a/TestON/tests/PLATdockertest/PLATdockertest.py b/TestON/tests/PLATdockertest/PLATdockertest.py
index f62998b..d744262 100644
--- a/TestON/tests/PLATdockertest/PLATdockertest.py
+++ b/TestON/tests/PLATdockertest/PLATdockertest.py
@@ -188,8 +188,8 @@
stepResult = stepResult and appRslt
main.log.debug("Apps activation result for " + ",".join(applist) + ": " + str(appResults) )
utilities.assert_equals( expect = main.TRUE, actual = stepResult,
- onpass = "Successfully activate apps",
- onfail = "Failed to activate apps correctly" )
+ onpass = "Successfully activated apps",
+ onfail = "Failed to activated apps correctly" )
if stepResult is main.FALSE: main.skipCase
main.step(" Deactivate an APP from REST and check APP status")
@@ -204,8 +204,8 @@
stepResult = stepResult and appRslt
main.log.debug("Apps deactivation result for " + ",".join(applist) + ": " + str(appResults) )
utilities.assert_equals( expect = main.TRUE, actual = stepResult,
- onpass = "Successfully deactivate apps",
- onfail = "Failed to deactivate apps correctly" )
+ onpass = "Successfully deactivated apps",
+ onfail = "Failed to deactivated apps correctly" )
if stepResult is main.FALSE: main.skipCase
def CASE1000( self, main ):
@@ -215,6 +215,7 @@
"""
import time
+ main.case("Clean up unwanted images and containers")
main.step("Stop onos containers")
stepResult = main.TRUE
for ctname in NODElist:
@@ -230,7 +231,7 @@
#main.step( "remove exiting onosproject/onos images")
#stepResult = main.ONOSbenchDocker.dockerRemoveImage( image = DOCKERREPO + ":" + DOCKERTAG )
- main.step( "remove exiting '<none>:<none>' images")
+ main.step( "remove exiting 'none:none' images")
stepResult = main.ONOSbenchDocker.dockerRemoveImage( image = "<none>:<none>" )
utilities.assert_equals( expect = main.TRUE, actual = stepResult,
onpass = "Succeeded in deleting image " + "<none>:<none>",