diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/environment.py | 2 | ||||
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/onosfunctest.py | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 874a0638f..ae1343c2d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -75,7 +75,7 @@ RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git ${repos_dir}/odl_test RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn -RUN git clone https://gerrit.onosproject.org/OnosSystemTest ${repos_dir}/onos +RUN git clone https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos RUN git clone https://github.com/opnfv/promise ${repos_dir}/promise RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno 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__': |