diff options
| author |   wuwb1989 <wuwenbin2@huawei.com> | 2016-06-21 18:04:00 +0800 |
|---|---|---|
| committer | wuwb1989 <wuwenbin2@huawei.com> | 2016-06-22 15:02:37 +0800 |
| commit | bc9dc25113e277e5e6c2021a708cd61dc22411b4 (patch) | |
| tree | 06e0afd046a0c3c628fa3384d7dffc5f1cf40560 /testcases/Controllers/ONOS | |
| parent | e33fad48760be43aeb37ab69a37673195a51de2d (diff) | |
modify onos tests' link to support onos 1.6
Change-Id: Ice9b19a1d569b4084921961ec0a3a9d961923521
Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
Diffstat (limited to 'testcases/Controllers/ONOS')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/environment.py | 2 | ||||
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/onosfunctest.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/testcases/Controllers/ONOS/Teston/adapters/environment.py b/testcases/Controllers/ONOS/Teston/adapters/environment.py index 69c4c010c..231677333 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 058114bde..f97d415d2 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__': |