aboutsummaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
Diffstat (limited to 'testcases')
-rw-r--r--testcases/Controllers/ONOS/Teston/adapters/environment.py2
-rw-r--r--testcases/Controllers/ONOS/Teston/onosfunctest.py14
-rw-r--r--testcases/vIMS/vIMS.py14
3 files changed, 15 insertions, 15 deletions
diff --git a/testcases/Controllers/ONOS/Teston/adapters/environment.py b/testcases/Controllers/ONOS/Teston/adapters/environment.py
index 69c4c010..23167733 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/environment.py
+++ b/testcases/Controllers/ONOS/Teston/adapters/environment.py
@@ -268,7 +268,7 @@ class environment(connection):
self.AddKnownHost(handle, self.OC2, "karaf", "karaf")
self.AddKnownHost(handle, self.OC3, "karaf", "karaf")
self.DownLoadCode(handle,
- 'https://github.com/sunyulin/OnosSystemTest.git')
+ 'https://github.com/wuwenbin2/OnosSystemTest.git')
# self.DownLoadCode(handle, 'https://gerrit.onosproject.org/onos')
if self.masterusername == 'root':
filepath = '/root/'
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
index 058114bd..f97d415d 100644
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -45,7 +45,7 @@ if not os.path.exists(REPO_PATH):
logger.error("Functest repository directory not found '%s'" % REPO_PATH)
exit(-1)
-ONOSCI_PATH = REPO_PATH + 'testcases/Controllers/ONOS/Teston/'
+ONOSCI_PATH = ONOS_REPO_PATH + "/"
starttime = datetime.datetime.now()
HOME = os.environ['HOME'] + "/"
@@ -57,12 +57,12 @@ def RunScript(testname):
Parameters:
testname: ONOS Testcase Name
"""
- runtest = ONOSCI_PATH + "OnosSystemTest/TestON/bin/cli.py run " + testname
+ runtest = ONOSCI_PATH + "onos/TestON/bin/cli.py run " + testname
logger.debug("Run script " + testname)
os.system(runtest)
-def DownloadCodes(url="https://github.com/sunyulin/OnosSystemTest.git"):
+def DownloadCodes(url="https://github.com/wuwenbin2/OnosSystemTest.git"):
"""
Download Onos Teston codes
Parameters:
@@ -74,7 +74,7 @@ def DownloadCodes(url="https://github.com/sunyulin/OnosSystemTest.git"):
def GetResult():
- LOGPATH = ONOSCI_PATH + "OnosSystemTest/TestON/logs"
+ LOGPATH = ONOSCI_PATH + "onos/TestON/logs"
cmd = "grep -rnh " + "Fail" + " " + LOGPATH
Resultbuffer = os.popen(cmd).read()
# duration = datetime.datetime.now() - starttime
@@ -156,7 +156,7 @@ def SetOnosIpForJoid():
def CleanOnosTest():
- TESTONPATH = ONOSCI_PATH + "OnosSystemTest/"
+ TESTONPATH = ONOSCI_PATH + "onos/"
cmd = "rm -rf " + TESTONPATH
os.system(cmd)
time.sleep(2)
@@ -166,7 +166,7 @@ def CleanOnosTest():
def main():
start_time = time.time()
stop_time = start_time
- DownloadCodes()
+ # DownloadCodes()
if args.installer == "joid":
logger.debug("Installer is Joid")
SetOnosIpForJoid()
@@ -202,7 +202,7 @@ def main():
except:
logger.error("Error pushing results into Database")
- CleanOnosTest()
+ # CleanOnosTest()
if __name__ == '__main__':
diff --git a/testcases/vIMS/vIMS.py b/testcases/vIMS/vIMS.py
index a35eba98..20a61158 100644
--- a/testcases/vIMS/vIMS.py
+++ b/testcases/vIMS/vIMS.py
@@ -26,8 +26,8 @@ import glanceclient.client as glclient
import novaclient.client as nvclient
from neutronclient.v2_0 import client as ntclient
-from clearwater import *
-from orchestrator import *
+from clearwater import clearwater
+from orchestrator import orchestrator
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as functest_utils
@@ -89,6 +89,7 @@ CW_REQUIERMENTS = functest_yaml.get("vIMS").get(
CFY_DEPLOYMENT_DURATION = 0
CW_DEPLOYMENT_DURATION = 0
+TESTCASE_START_TIME = time.time()
RESULTS = {'orchestrator': {'duration': 0, 'result': ''},
'vIMS': {'duration': 0, 'result': ''},
'sig_test': {'duration': 0, 'result': ''}}
@@ -117,14 +118,13 @@ def step_failure(step_name, error_msg):
set_result(step_name, 0, error_msg)
status = "FAIL"
# in case of failure starting and stoping time are not correct
- start_time = time.time()
- stop_time = start_time
+ stop_time = time.time()
if step_name == "sig_test":
status = "PASS"
functest_utils.push_results_to_db("functest",
"vims",
None,
- start_time,
+ TESTCASE_START_TIME,
stop_time,
status,
RESULTS)
@@ -244,9 +244,9 @@ def test_clearwater():
logger.error("Unable to set test status")
functest_utils.push_results_to_db("functest",
- "vIMS",
+ "vims",
logger,
- start_time_ts,
+ TESTCASE_START_TIME,
end_time_ts,
status,
RESULTS)