From 68d29b6f6e71df6b4f177cd417f98d9e977f8893 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Tue, 17 May 2016 21:36:56 +0200
Subject: Change 'testcases' directory structure

JIRA: FUNCTEST-226

- Remove all 'CI' subdirs
- Remove VIM dir and have OpenStack dir within /testcases/
- Split rally and tempest in 2 different dirs

Change-Id: Icfc76d18a84f7a18d93ae1a5ec7dc7a560bb7ce9
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 testcases/Controllers/ONOS/Teston/CI/Readme.txt    |   5 -
 testcases/Controllers/ONOS/Teston/CI/__init__.py   |   0
 .../ONOS/Teston/CI/adapters/__init__.py            |   0
 .../Controllers/ONOS/Teston/CI/adapters/client.py  |  88 -------
 .../ONOS/Teston/CI/adapters/connection.py          | 196 --------------
 .../ONOS/Teston/CI/adapters/environment.py         | 281 ---------------------
 .../ONOS/Teston/CI/adapters/foundation.py          | 104 --------
 .../Controllers/ONOS/Teston/CI/dependencies/onos   |  29 ---
 testcases/Controllers/ONOS/Teston/CI/log/gitignore |   0
 .../Controllers/ONOS/Teston/CI/onosfunctest.py     | 208 ---------------
 testcases/Controllers/ONOS/Teston/Readme.txt       |   5 +
 testcases/Controllers/ONOS/Teston/__init__.py      |   0
 .../Controllers/ONOS/Teston/adapters/__init__.py   |   0
 .../Controllers/ONOS/Teston/adapters/client.py     |  88 +++++++
 .../Controllers/ONOS/Teston/adapters/connection.py | 196 ++++++++++++++
 .../ONOS/Teston/adapters/environment.py            | 281 +++++++++++++++++++++
 .../Controllers/ONOS/Teston/adapters/foundation.py | 104 ++++++++
 .../Controllers/ONOS/Teston/dependencies/onos      |  29 +++
 testcases/Controllers/ONOS/Teston/log/gitignore    |   0
 testcases/Controllers/ONOS/Teston/onosfunctest.py  | 208 +++++++++++++++
 20 files changed, 911 insertions(+), 911 deletions(-)
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/Readme.txt
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/__init__.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/adapters/client.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/adapters/connection.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/adapters/environment.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/dependencies/onos
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/log/gitignore
 delete mode 100644 testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
 create mode 100644 testcases/Controllers/ONOS/Teston/Readme.txt
 create mode 100644 testcases/Controllers/ONOS/Teston/__init__.py
 create mode 100644 testcases/Controllers/ONOS/Teston/adapters/__init__.py
 create mode 100644 testcases/Controllers/ONOS/Teston/adapters/client.py
 create mode 100644 testcases/Controllers/ONOS/Teston/adapters/connection.py
 create mode 100644 testcases/Controllers/ONOS/Teston/adapters/environment.py
 create mode 100644 testcases/Controllers/ONOS/Teston/adapters/foundation.py
 create mode 100644 testcases/Controllers/ONOS/Teston/dependencies/onos
 create mode 100644 testcases/Controllers/ONOS/Teston/log/gitignore
 create mode 100644 testcases/Controllers/ONOS/Teston/onosfunctest.py

(limited to 'testcases/Controllers/ONOS')

diff --git a/testcases/Controllers/ONOS/Teston/CI/Readme.txt b/testcases/Controllers/ONOS/Teston/CI/Readme.txt
deleted file mode 100644
index 7393f59a..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/Readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-1.This is a basic test run about onos,we will make them better and better
-2.This test include two suites:
-(1)Test northbound(network/subnet/ports create/update/delete)
-(2)Ovsdb test,default configuration,openflow connection,vm go onlines.
-3.Later we will make a framework to do this test
\ No newline at end of file
diff --git a/testcases/Controllers/ONOS/Teston/CI/__init__.py b/testcases/Controllers/ONOS/Teston/CI/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py b/testcases/Controllers/ONOS/Teston/CI/adapters/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/client.py b/testcases/Controllers/ONOS/Teston/CI/adapters/client.py
deleted file mode 100644
index 77de092e..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/adapters/client.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-Description:
-    This file is used to run testcase
-    lanqinglong@huawei.com
-
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-"""
-from environment import environment
-import time
-import pexpect
-import requests
-import json
-
-
-class client(environment):
-
-    def __init__(self):
-        environment.__init__(self)
-        self.loginfo = environment()
-        self.testcase = ''
-
-    def RunScript(self, handle, testname, timeout=300):
-        """
-        Run ONOS Test Script
-        Parameters:
-        testname: ONOS Testcase Name
-        masterusername: The server username of running ONOS
-        masterpassword: The server password of running ONOS
-        """
-        self.testcase = testname
-        self.ChangeTestCasePara(testname, self.masterusername,
-                                self.masterpassword)
-        runhandle = handle
-        runtest = (self.home + "/OnosSystemTest/TestON/bin/cli.py run " +
-                   testname)
-        runhandle.sendline(runtest)
-        circletime = 0
-        lastshowscreeninfo = ''
-        while True:
-            Result = runhandle.expect(["PEXPECT]#", pexpect.EOF,
-                                       pexpect.TIMEOUT])
-            curshowscreeninfo = runhandle.before
-            if(len(lastshowscreeninfo) != len(curshowscreeninfo)):
-                self.loginfo.log(str(curshowscreeninfo)
-                                 [len(lastshowscreeninfo)::])
-                lastshowscreeninfo = curshowscreeninfo
-            if Result == 0:
-                print "Done!"
-                return
-            time.sleep(1)
-            circletime += 1
-            if circletime > timeout:
-                break
-        self.loginfo.log("Timeout when running the test, please check!")
-
-    def onosstart(self):
-        # This is the compass run machine user&pass,you need to modify
-
-        print "Test Begin....."
-        self.OnosConnectionSet()
-        masterhandle = self.SSHlogin(self.localhost, self.masterusername,
-                                     self.masterpassword)
-        self.OnosEnvSetup(masterhandle)
-        return masterhandle
-
-    def onosclean(self, handle):
-        self.SSHRelease(handle)
-        self.loginfo.log('Release onos handle Successful')
-
-    def push_results_to_db(self, payload, pushornot=1):
-        if pushornot != 1:
-            return 1
-        url = self.Result_DB + "/results"
-        params = {"project_name": "functest", "case_name": "ONOS-" +
-                  self.testcase, "pod_name": 'huawei-build-2',
-                  "details": payload}
-
-        headers = {'Content-Type': 'application/json'}
-        try:
-            r = requests.post(url, data=json.dumps(params), headers=headers)
-            self.loginfo.log(r)
-        except:
-            self.loginfo.log('Error pushing results into Database')
diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/connection.py b/testcases/Controllers/ONOS/Teston/CI/adapters/connection.py
deleted file mode 100644
index 16f2ef32..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/adapters/connection.py
+++ /dev/null
@@ -1,196 +0,0 @@
-"""
-Description:
-    This file is used to make connections
-    Include ssh & exchange public-key to each other so that
-    it can run without password
-
-    lanqinglong@huawei.com
-
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-"""
-import os
-import pexpect
-import re
-from foundation import foundation
-
-
-class connection(foundation):
-
-    def __init__(self):
-        foundation.__init__(self)
-        self.loginfo = foundation()
-
-    def AddKnownHost(self, handle, ipaddr, username, password):
-        """
-        Add an user to known host,so that onos can login in with onos $ipaddr.
-        parameters:
-        ipaddr:   ip address
-        username: login user name
-        password: login password
-        """
-        print("Now Adding an user to known hosts " + ipaddr)
-        login = handle
-        login.sendline("ssh -l %s -p 8101 %s" % (username, ipaddr))
-        index = 0
-        while index != 2:
-            index = login.expect(['assword:', 'yes/no', pexpect.EOF,
-                                  pexpect.TIMEOUT])
-            if index == 0:
-                login.sendline(password)
-                login.sendline("logout")
-                index = login.expect(["closed", pexpect.EOF])
-                if index == 0:
-                    self.loginfo.log("Add SSH Known Host Success!")
-                    break
-                else:
-                    self.loginfo.log("Add SSH Known Host Failed! "
-                                     "Please Check!")
-                    break
-                login.prompt()
-
-            if index == 1:
-                login.sendline('yes')
-
-    def GetEnvValue(self, handle, envname):
-        """
-        os.getenv only returns current user value
-        GetEnvValue returns a environment value of
-            current handle
-        eg: GetEnvValue(handle,'HOME')
-        """
-        envhandle = handle
-        envhandle.sendline('echo $' + envname)
-        envhandle.prompt()
-        reg = envname + '\r\n(.*)\r'
-        envaluereg = re.compile(reg)
-        envalue = envaluereg.search(envhandle.before)
-        if envalue:
-            return envalue.groups()[0]
-        else:
-            return None
-
-    def Gensshkey(self, handle):
-        """
-        Generate ssh keys, used for some server have no sshkey.
-        """
-        print "Now Generating SSH keys..."
-        # Here file name may be id_rsa or id_ecdsa or others
-        # So here will have a judgement
-        keysub = handle
-        filepath = self.GetEnvValue(keysub, 'HOME') + '/.ssh'
-        filelist = os.listdir(filepath)
-        for item in filelist:
-            if 'id' in item:
-                self.loginfo.log("SSH keys are exsit in ssh directory.")
-                return True
-        keysub.sendline("ssh-keygen -t rsa")
-        Result = 0
-        while Result != 2:
-            Result = keysub.expect(["Overwrite", "Enter", pexpect.EOF,
-                                    'PEXPECT]#', pexpect.TIMEOUT])
-            if Result == 0:
-                keysub.sendline("y")
-            if Result == 1 or Result == 2:
-                keysub.sendline("\n")
-            if Result == 3:
-                self.loginfo.log("Generate SSH key success.")
-                keysub.prompt()
-                break
-            if Result == 4:
-                self.loginfo.log("Generate SSH key failed.")
-                keysub.prompt()
-                break
-
-    def GetRootAuth(self, password):
-        """
-        Get root user
-        parameters:
-        password: root login password
-        """
-        print("Now changing to user root")
-        login = pexpect.spawn("su - root")
-        index = 0
-        while index != 2:
-            index = login.expect(['assword:', "failure",
-                                  pexpect.EOF, pexpect.TIMEOUT])
-            if index == 0:
-                login.sendline(password)
-            if index == 1:
-                self.loginfo.log("Change user to root failed.")
-
-        login.interact()
-
-    def ReleaseRootAuth(self):
-        """
-        Exit root user.
-        """
-        print("Now Release user root")
-        login = pexpect.spawn("exit")
-        index = login.expect(['logout', pexpect.EOF, pexpect.TIMEOUT])
-        if index == 0:
-            self.loginfo.log("Release root user success.")
-        if index == 1:
-            self.loginfo.log("Release root user failed.")
-
-        login.interact()
-
-    def AddEnvIntoBashrc(self, envalue):
-        """
-        Add Env var into /etc/profile.
-        parameters:
-        envalue: environment value to add
-        """
-        print "Now Adding bash environment"
-        fileopen = open("/etc/profile", 'r')
-        findContext = 1
-        while findContext:
-            findContext = fileopen.readline()
-            result = findContext.find(envalue)
-            if result != -1:
-                break
-        fileopen.close
-        if result == -1:
-            envAdd = open("/etc/profile", 'a+')
-            envAdd.writelines("\n" + envalue)
-            envAdd.close()
-        self.loginfo.log("Add env to bashrc success!")
-
-    def OnosRootPathChange(self, onospath):
-        """
-        Change ONOS root path in file:bash_profile
-        onospath: path of onos root
-        """
-        print "Now Changing ONOS Root Path"
-        filepath = onospath + 'onos/tools/dev/bash_profile'
-        line = open(filepath, 'r').readlines()
-        lenall = len(line) - 1
-        for i in range(lenall):
-            if "export ONOS_ROOT" in line[i]:
-                line[i] = 'export ONOS_ROOT=' + onospath + 'onos\n'
-        NewFile = open(filepath, 'w')
-        NewFile.writelines(line)
-        NewFile.close
-        print "Done!"
-
-    def OnosConnectionSet(self):
-        """
-        Intergrate for ONOS connection setup
-        """
-        if self.masterusername == 'root':
-            filepath = '/root/'
-        else:
-            filepath = '/home/' + self.masterusername + '/'
-        filepath = os.path.join(filepath, "onos/tools/dev/bash_profile")
-        self.AddEnvIntoBashrc("source " + filepath + "\n")
-        self.AddEnvIntoBashrc("export OCT=" + self.OCT)
-        self.AddEnvIntoBashrc("export OC1=" + self.OC1)
-        self.AddEnvIntoBashrc("export OC2=" + self.OC2)
-        self.AddEnvIntoBashrc("export OC3=" + self.OC3)
-        self.AddEnvIntoBashrc("export OCN=" + self.OCN)
-        self.AddEnvIntoBashrc("export OCN2=" + self.OCN2)
-        self.AddEnvIntoBashrc("export localhost=" + self.localhost)
diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/environment.py b/testcases/Controllers/ONOS/Teston/CI/adapters/environment.py
deleted file mode 100644
index 49f7f963..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/adapters/environment.py
+++ /dev/null
@@ -1,281 +0,0 @@
-"""
-Description:
-    This file is used to setup the running environment
-    Include Download code,setup environment variable
-            Set onos running config
-            Set user name/password
-            Onos-push-keys and so on
-    lanqinglong@huawei.com
-
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-"""
-
-import os
-import time
-import pexpect
-import re
-import sys
-import pxssh
-from connection import connection
-
-
-class environment(connection):
-
-    def __init__(self):
-        connection.__init__(self)
-        self.loginfo = connection()
-        self.masterhandle = ''
-        self.home = ''
-
-    def DownLoadCode(self, handle, codeurl):
-        """
-        Download Code use 'git clone'
-        parameters:
-        handle:  current working handle
-        codeurl: clone code url
-        """
-        print "Now loading test codes! Please wait in patient..."
-        originalfolder = sys.path[0]
-        print originalfolder
-        gitclone = handle
-        gitclone.sendline("git clone " + codeurl)
-        index = 0
-        # increment = 0
-        while index != 1 or index != 4:
-            index = gitclone.expect(['already exists',
-                                     'esolving deltas: 100%',
-                                     'eceiving objects',
-                                     'Already up-to-date',
-                                     'npacking objects: 100%', pexpect.EOF])
-
-            filefolder = self.home + '/' + codeurl.split('/')[-1].split('.')[0]
-            if index == 0:
-                os.chdir(filefolder)
-                os.system('git pull')
-                os.chdir(originalfolder)
-                self.loginfo.log('Download code success!')
-                break
-            elif index == 1 or index == 4:
-                self.loginfo.log('Download code success!')
-                gitclone.sendline("mkdir onos")
-                gitclone.prompt()
-                gitclone.sendline("cp -rf " + filefolder + "/tools onos/")
-                gitclone.prompt()
-                break
-            elif index == 2:
-                os.write(1, gitclone.before)
-                sys.stdout.flush()
-            else:
-                self.loginfo.log('Download code failed!')
-                self.loginfo.log('Information before' + gitclone.before)
-                break
-        gitclone.prompt()
-
-    def InstallDefaultSoftware(self, handle):
-        """
-        Install default software
-        parameters:
-        handle(input): current working handle
-        """
-        print "Now Cleaning test environment"
-        handle.sendline("sudo apt-get install -y mininet")
-        handle.prompt()
-        handle.sendline("sudo pip install configobj")
-        handle.prompt()
-        handle.sendline("sudo apt-get install -y sshpass")
-        handle.prompt()
-        handle.sendline("OnosSystemTest/TestON/bin/cleanup.sh")
-        handle.prompt()
-        time.sleep(5)
-        self.loginfo.log('Clean environment success!')
-
-    def OnosPushKeys(self, handle, cmd, password):
-        """
-        Using onos-push-keys to make ssh device without password
-        parameters:
-        handle(input): working handle
-        cmd(input): onos-push-keys xxx(xxx is device)
-        password(input): login in password
-        """
-        print "Now Pushing Onos Keys:" + cmd
-        Pushkeys = handle
-        Pushkeys.sendline(cmd)
-        Result = 0
-        while Result != 2:
-            Result = Pushkeys.expect(["(yes/no)", "assword:", "PEXPECT]#",
-                                      pexpect.EOF, pexpect.TIMEOUT])
-            if(Result == 0):
-                Pushkeys.sendline("yes")
-            if(Result == 1):
-                Pushkeys.sendline(password)
-            if(Result == 2):
-                self.loginfo.log("ONOS Push keys Success!")
-                break
-            if(Result == 3):
-                self.loginfo.log("ONOS Push keys Error!")
-                break
-            time.sleep(2)
-        Pushkeys.prompt()
-        print "Done!"
-
-    def SetOnosEnvVar(self, handle, masterpass, agentpass):
-        """
-        Setup onos pushkeys to all devices(3+2)
-        parameters:
-        handle(input): current working handle
-        masterpass: scripts running server's password
-        agentpass: onos cluster&compute node password
-        """
-        print "Now Setting test environment"
-        for host in self.hosts:
-            print "try to connect " + str(host)
-            result = self.CheckSshNoPasswd(host)
-            if not result:
-                print ("ssh lgin failed,try to copy master publickey" +
-                       "to agent " + str(host))
-                self.CopyPublicKey(host)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OCT, masterpass)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OC1, agentpass)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OC2, agentpass)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OC3, agentpass)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OCN, agentpass)
-        self.OnosPushKeys(handle, "onos-push-keys " + self.OCN2, agentpass)
-
-    def CheckSshNoPasswd(self, host):
-        """
-        Check master can connect agent with no password
-        """
-        login = pexpect.spawn("ssh " + str(host))
-        index = 4
-        while index == 4:
-            index = login.expect(['(yes/no)', '>|#|\$',
-                                  pexpect.EOF, pexpect.TIMEOUT])
-            if index == 0:
-                login.sendline("yes")
-                index = 4
-            if index == 1:
-                self.loginfo.log("ssh connect to " + str(host) +
-                                 " success,no need to copy ssh public key")
-                return True
-        login.interact()
-        return False
-
-    def ChangeOnosName(self, user, password):
-        """
-        Change onos name in envDefault file
-        Because some command depend on this
-        parameters:
-        user: onos&compute node user
-        password: onos&compute node password
-        """
-        print "Now Changing ONOS name&password"
-        filepath = self.home + '/onos/tools/build/envDefaults'
-        line = open(filepath, 'r').readlines()
-        lenall = len(line) - 1
-        for i in range(lenall):
-            if "ONOS_USER=" in line[i]:
-                line[i] = line[i].replace("sdn", user)
-            if "ONOS_GROUP" in line[i]:
-                line[i] = line[i].replace("sdn", user)
-            if "ONOS_PWD" in line[i]:
-                line[i] = line[i].replace("rocks", password)
-        NewFile = open(filepath, 'w')
-        NewFile.writelines(line)
-        NewFile.close
-        print "Done!"
-
-    def ChangeTestCasePara(self, testcase, user, password):
-        """
-        When running test script, there's something need \
-        to change in every test folder's *.param & *.topo files
-        user: onos&compute node user
-        password: onos&compute node password
-        """
-        print "Now Changing " + testcase + " name&password"
-        if self.masterusername == 'root':
-            filepath = '/root/'
-        else:
-            filepath = '/home/' + self.masterusername + '/'
-        filepath = (filepath + "OnosSystemTest/TestON/tests/" +
-                    testcase + "/" + testcase + ".topo")
-        line = open(filepath, 'r').readlines()
-        lenall = len(line) - 1
-        for i in range(lenall - 2):
-            if("localhost" in line[i]) or ("OCT" in line[i]):
-                line[i + 1] = re.sub(">\w+", ">" + user, line[i + 1])
-                line[i + 2] = re.sub(">\w+", ">" + password, line[i + 2])
-            if ("OC1" in line[i] or "OC2" in line[i] or "OC3" in line[i] or
-                    "OCN" in line[i] or "OCN2" in line[i]):
-                line[i + 1] = re.sub(">\w+", ">root", line[i + 1])
-                line[i + 2] = re.sub(">\w+", ">root", line[i + 2])
-        NewFile = open(filepath, 'w')
-        NewFile.writelines(line)
-        NewFile.close
-
-    def SSHlogin(self, ipaddr, username, password):
-        """
-        SSH login provide a connection to destination.
-        parameters:
-        ipaddr:   ip address
-        username: login user name
-        password: login password
-        return: handle
-        """
-        login = pxssh.pxssh()
-        login.login(ipaddr, username, password, original_prompt='[$#>]')
-        # send command ls -l
-        login.sendline('ls -l')
-        # match prompt
-        login.prompt()
-        print("SSH login " + ipaddr + " success!")
-        return login
-
-    def SSHRelease(self, handle):
-        # Release ssh
-        handle.logout()
-
-    def CopyOnostoTestbin(self):
-        sourcefile = self.cipath + '/dependencies/onos'
-        destifile = self.home + '/onos/tools/test/bin/'
-        os.system('pwd')
-        runcommand = 'cp ' + sourcefile + ' ' + destifile
-        os.system(runcommand)
-
-    def CopyPublicKey(self, host):
-        output = os.popen('cat /root/.ssh/id_rsa.pub')
-        publickey = output.read().strip('\n')
-        tmphandle = self.SSHlogin(self.installer_master,
-                                  self.installer_master_username,
-                                  self.installer_master_password)
-        tmphandle.sendline("ssh " + host + " -T \'echo " +
-                           str(publickey) + ">>/root/.ssh/authorized_keys\'")
-        tmphandle.prompt()
-        self.SSHRelease(tmphandle)
-        print "Add OCT PublicKey to " + host + " success"
-
-    def OnosEnvSetup(self, handle):
-        """
-        Onos Environment Setup function
-        """
-        self.Gensshkey(handle)
-        self.home = self.GetEnvValue(handle, 'HOME')
-        self.AddKnownHost(handle, self.OC1, "karaf", "karaf")
-        self.AddKnownHost(handle, self.OC2, "karaf", "karaf")
-        self.AddKnownHost(handle, self.OC3, "karaf", "karaf")
-        self.DownLoadCode(handle,
-                          'https://github.com/sunyulin/OnosSystemTest.git')
-        # self.DownLoadCode(handle, 'https://gerrit.onosproject.org/onos')
-        if self.masterusername == 'root':
-            filepath = '/root/'
-        else:
-            filepath = '/home/' + self.masterusername + '/'
-        self.OnosRootPathChange(filepath)
-        self.CopyOnostoTestbin()
-        self.ChangeOnosName(self.agentusername, self.agentpassword)
-        self.InstallDefaultSoftware(handle)
-        self.SetOnosEnvVar(handle, self.masterpassword, self.agentpassword)
diff --git a/testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py
deleted file mode 100644
index 47605eb7..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/adapters/foundation.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-Description:
-    This file include basis functions
-    lanqinglong@huawei.com
-
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-"""
-
-import logging
-import os
-import time
-import yaml
-import re
-import datetime
-
-
-class foundation:
-
-    def __init__(self):
-
-        # currentpath = os.getcwd()
-        REPO_PATH = os.environ['repos_dir'] + '/functest/'
-        currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI'
-        self.cipath = currentpath
-        self.logdir = os.path.join(currentpath, 'log')
-        self.workhome = currentpath[0: currentpath.rfind('testcases') - 1]
-        self.Result_DB = ''
-        filename = time.strftime('%Y-%m-%d-%H-%M-%S') + '.log'
-        self.logfilepath = os.path.join(self.logdir, filename)
-        self.starttime = datetime.datetime.now()
-
-    def log(self, loginfo):
-        """
-        Record log in log directory for deploying test environment
-        parameters:
-        loginfo(input): record info
-        """
-        logging.basicConfig(level=logging.INFO,
-                            format='%(asctime)s %(filename)s:%(message)s',
-                            datefmt='%d %b %Y %H:%M:%S',
-                            filename=self.logfilepath,
-                            filemode='w')
-        filelog = logging.FileHandler(self.logfilepath)
-        logging.getLogger('Functest').addHandler(filelog)
-        print loginfo
-        logging.info(loginfo)
-
-    def getdefaultpara(self):
-        """
-        Get Default Parameters value
-        """
-        with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
-            functest_yaml = yaml.safe_load(f)
-
-        self.Result_DB = str(functest_yaml.get("results").get("test_db_url"))
-        self.masterusername = str(functest_yaml.get("ONOS").get("general").
-                                  get('onosbench_username'))
-        self.masterpassword = str(functest_yaml.get("ONOS").get("general").
-                                  get("onosbench_password"))
-        self.agentusername = str(functest_yaml.get("ONOS").get("general").
-                                 get("onoscli_username"))
-        self.agentpassword = str(functest_yaml.get("ONOS").get("general").
-                                 get("onoscli_password"))
-        self.runtimeout = functest_yaml.get("ONOS").get("general").get(
-            "runtimeout")
-        self.OCT = str(functest_yaml.get("ONOS").get("environment").get("OCT"))
-        self.OC1 = str(functest_yaml.get("ONOS").get("environment").get("OC1"))
-        self.OC2 = str(functest_yaml.get("ONOS").get("environment").get("OC2"))
-        self.OC3 = str(functest_yaml.get("ONOS").get("environment").get("OC3"))
-        self.OCN = str(functest_yaml.get("ONOS").get("environment").get("OCN"))
-        self.OCN2 = str(functest_yaml.get("ONOS").
-                        get("environment").get("OCN2"))
-        self.installer_master = str(functest_yaml.get("ONOS").
-                                    get("environment").get("installer_master"))
-        self.installer_master_username = str(functest_yaml.get("ONOS").
-                                             get("environment").
-                                             get("installer_master_username"))
-        self.installer_master_password = str(functest_yaml.get("ONOS").
-                                             get("environment").
-                                             get("installer_master_password"))
-        self.hosts = [self.OC1, self.OCN, self.OCN2]
-        self.localhost = self.OCT
-
-    def GetResult(self):
-        cmd = "cat " + self.logfilepath + " | grep Fail"
-        Resultbuffer = os.popen(cmd).read()
-        duration = datetime.datetime.now() - self.starttime
-        time.sleep(2)
-
-        if re.search("[1-9]+", Resultbuffer):
-            self.log("Testcase Fails\n" + Resultbuffer)
-            Result = "POK"
-        else:
-            self.log("Testcases Pass")
-            Result = "OK"
-        payload = {'timestart': str(self.starttime),
-                   'duration': str(duration), 'status': Result}
-
-        return payload
diff --git a/testcases/Controllers/ONOS/Teston/CI/dependencies/onos b/testcases/Controllers/ONOS/Teston/CI/dependencies/onos
deleted file mode 100644
index bb02fa89..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/dependencies/onos
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# ONOS remote command-line client.
-# -----------------------------------------------------------------------------
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-
-[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-. /root/.bashrc
-. $ONOS_ROOT/tools/build/envDefaults
-. $ONOS_ROOT/tools/test/bin/find-node.sh
-
-[ "$1" = "-w" ] && shift && onos-wait-for-start $1
-
-[ -n "$1" ] && OCI=$(find_node $1) && shift
-
-if which client 1>/dev/null 2>&1 && [ -z "$ONOS_USE_SSH" ]; then
-    # Use Karaf client only if we can and are allowed to
-    unset KARAF_HOME
-    client -h $OCI -u karaf "$@" 2>/dev/null
-else
-    # Otherwise use raw ssh; strict checking is off for dev environments only
-    #ssh -p 8101 -o StrictHostKeyChecking=no $OCI "$@"
-    sshpass -p karaf ssh -l karaf -p 8101 $OCI "$@"
-fi
diff --git a/testcases/Controllers/ONOS/Teston/CI/log/gitignore b/testcases/Controllers/ONOS/Teston/CI/log/gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
deleted file mode 100644
index 1e278e6a..00000000
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""
-Description: This test is to run onos Teston VTN scripts
-
-List of test cases:
-CASE1 - Northbound NBI test network/subnet/ports
-CASE2 - Ovsdb test&Default configuration&Vm go online
-
-lanqinglong@huawei.com
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-"""
-
-import argparse
-import datetime
-import os
-import re
-import time
-import yaml
-
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as functest_utils
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-i", "--installer", help="Installer type")
-args = parser.parse_args()
-""" logging configuration """
-logger = ft_logger.Logger("onos").getLogger()
-
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
-    functest_yaml = yaml.safe_load(f)
-f.close()
-
-# onos parameters
-TEST_DB = functest_yaml.get("results").get("test_db_url")
-ONOS_REPO_PATH = functest_yaml.get("general").get("directories").get(
-    "dir_repos")
-ONOS_CONF_DIR = functest_yaml.get("general").get("directories").get(
-    "dir_functest_conf")
-REPO_PATH = ONOS_REPO_PATH + '/functest/'
-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/CI/'
-starttime = datetime.datetime.now()
-
-HOME = os.environ['HOME'] + "/"
-
-
-def RunScript(testname):
-    """
-    Run ONOS Test Script
-    Parameters:
-    testname: ONOS Testcase Name
-    """
-    runtest = ONOSCI_PATH + "OnosSystemTest/TestON/bin/cli.py run " + testname
-    logger.debug("Run script " + testname)
-    os.system(runtest)
-
-
-def DownloadCodes(url="https://github.com/sunyulin/OnosSystemTest.git"):
-    """
-    Download Onos Teston codes
-    Parameters:
-    url: github url
-    """
-    downloadcode = "git clone " + url + " " + ONOSCI_PATH + "OnosSystemTest"
-    logger.debug("Download Onos Teston codes " + url)
-    os.system(downloadcode)
-
-
-def GetResult():
-    LOGPATH = ONOSCI_PATH + "OnosSystemTest/TestON/logs"
-    cmd = "grep -rnh " + "Fail" + " " + LOGPATH
-    Resultbuffer = os.popen(cmd).read()
-    # duration = datetime.datetime.now() - starttime
-    time.sleep(2)
-
-    if re.search("\s+[1-9]+\s+", Resultbuffer):
-        logger.debug("Testcase Fails\n" + Resultbuffer)
-        # Result = "Failed"
-    else:
-        logger.debug("Testcases Success")
-        # Result = "Success"
-    # payload={'timestart': str(starttime),
-    #          'duration': str(duration),
-    #            'status': Result}
-    cmd = "grep -rnh 'Execution Time' " + LOGPATH
-    Resultbuffer = os.popen(cmd).read()
-    time1 = Resultbuffer[114:128]
-    time2 = Resultbuffer[28:42]
-    cmd = "grep -rnh 'Success Percentage' " + LOGPATH + "/FUNCvirNetNB_*"
-    Resultbuffer = os.popen(cmd).read()
-    if Resultbuffer.find('100%') >= 0:
-        result1 = 'Success'
-    else:
-        result1 = 'Failed'
-    cmd = "grep -rnh 'Success Percentage' " + LOGPATH + "/FUNCvirNetNBL3*"
-    Resultbuffer = os.popen(cmd).read()
-    if Resultbuffer.find('100%') >= 0:
-        result2 = 'Success'
-    else:
-        result2 = 'Failed'
-    status1 = []
-    status2 = []
-    cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNB_*"
-    Resultbuffer = os.popen(cmd).read()
-    pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
-    # res = pattern.search(Resultbuffer).groups()
-    res = pattern.findall(Resultbuffer)
-    i = 0
-    for index in range(len(res)):
-        status1.append({'Case name:': res[i][0] + res[i][1],
-                        'Case result': res[i][2]})
-        i = i + 1
-    cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNBL3*"
-    Resultbuffer = os.popen(cmd).read()
-    pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
-    # res = pattern.search(Resultbuffer).groups()
-    res = pattern.findall(Resultbuffer)
-    i = 0
-    for index in range(len(res)):
-        status2.append({'Case name:': res[i][0] + res[i][1],
-                        'Case result': res[i][2]})
-        i = i + 1
-    payload = {'timestart': str(starttime),
-               'FUNCvirNet': {'duration': time1,
-                              'result': result1,
-                              'status': status1},
-               'FUNCvirNetL3': {'duration': time2,
-                                'result': result2,
-                                'status': status2}}
-    return payload
-
-
-def SetOnosIp():
-    cmd = "openstack catalog show network | grep publicURL"
-    cmd_output = os.popen(cmd).read()
-    OC1 = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
-    os.environ['OC1'] = OC1
-    time.sleep(2)
-    logger.debug("ONOS IP is " + OC1)
-
-
-def SetOnosIpForJoid():
-    cmd = "env | grep SDN_CONTROLLER"
-    cmd_output = os.popen(cmd).read()
-    OC1 = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
-    os.environ['OC1'] = OC1
-    time.sleep(2)
-    logger.debug("ONOS IP is " + OC1)
-
-
-def CleanOnosTest():
-    TESTONPATH = ONOSCI_PATH + "OnosSystemTest/"
-    cmd = "rm -rf " + TESTONPATH
-    os.system(cmd)
-    time.sleep(2)
-    logger.debug("Clean ONOS Teston")
-
-
-def main():
-
-    DownloadCodes()
-    if args.installer == "joid":
-        logger.debug("Installer is Joid")
-        SetOnosIpForJoid()
-    else:
-        SetOnosIp()
-    RunScript("FUNCvirNetNB")
-    RunScript("FUNCvirNetNBL3")
-
-    try:
-        logger.debug("Push result into DB")
-        # TODO check path result for the file
-        scenario = functest_utils.get_scenario(logger)
-        version = functest_utils.get_version(logger)
-        result = GetResult()
-
-        # ONOS success criteria = all tests OK
-        # i.e. FUNCvirNet & FUNCvirNetL3
-        status = "failed"
-        try:
-            if (result['FUNCvirNet']['result'] == "Success" and
-                    result['FUNCvirNetL3']['result'] == "Success"):
-                    status = "passed"
-        except:
-            logger.error("Unable to set ONOS criteria")
-
-        pod_name = functest_utils.get_pod_name(logger)
-        build_tag = functest_utils.get_build_tag(logger)
-        functest_utils.push_results_to_db(TEST_DB,
-                                          "functest",
-                                          "ONOS",
-                                          logger, pod_name, version, scenario,
-                                          status, build_tag, payload=result)
-    except:
-        logger.error("Error pushing results into Database")
-
-    CleanOnosTest()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/testcases/Controllers/ONOS/Teston/Readme.txt b/testcases/Controllers/ONOS/Teston/Readme.txt
new file mode 100644
index 00000000..7393f59a
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/Readme.txt
@@ -0,0 +1,5 @@
+1.This is a basic test run about onos,we will make them better and better
+2.This test include two suites:
+(1)Test northbound(network/subnet/ports create/update/delete)
+(2)Ovsdb test,default configuration,openflow connection,vm go onlines.
+3.Later we will make a framework to do this test
\ No newline at end of file
diff --git a/testcases/Controllers/ONOS/Teston/__init__.py b/testcases/Controllers/ONOS/Teston/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/testcases/Controllers/ONOS/Teston/adapters/__init__.py b/testcases/Controllers/ONOS/Teston/adapters/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/testcases/Controllers/ONOS/Teston/adapters/client.py b/testcases/Controllers/ONOS/Teston/adapters/client.py
new file mode 100644
index 00000000..77de092e
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/adapters/client.py
@@ -0,0 +1,88 @@
+"""
+Description:
+    This file is used to run testcase
+    lanqinglong@huawei.com
+
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+from environment import environment
+import time
+import pexpect
+import requests
+import json
+
+
+class client(environment):
+
+    def __init__(self):
+        environment.__init__(self)
+        self.loginfo = environment()
+        self.testcase = ''
+
+    def RunScript(self, handle, testname, timeout=300):
+        """
+        Run ONOS Test Script
+        Parameters:
+        testname: ONOS Testcase Name
+        masterusername: The server username of running ONOS
+        masterpassword: The server password of running ONOS
+        """
+        self.testcase = testname
+        self.ChangeTestCasePara(testname, self.masterusername,
+                                self.masterpassword)
+        runhandle = handle
+        runtest = (self.home + "/OnosSystemTest/TestON/bin/cli.py run " +
+                   testname)
+        runhandle.sendline(runtest)
+        circletime = 0
+        lastshowscreeninfo = ''
+        while True:
+            Result = runhandle.expect(["PEXPECT]#", pexpect.EOF,
+                                       pexpect.TIMEOUT])
+            curshowscreeninfo = runhandle.before
+            if(len(lastshowscreeninfo) != len(curshowscreeninfo)):
+                self.loginfo.log(str(curshowscreeninfo)
+                                 [len(lastshowscreeninfo)::])
+                lastshowscreeninfo = curshowscreeninfo
+            if Result == 0:
+                print "Done!"
+                return
+            time.sleep(1)
+            circletime += 1
+            if circletime > timeout:
+                break
+        self.loginfo.log("Timeout when running the test, please check!")
+
+    def onosstart(self):
+        # This is the compass run machine user&pass,you need to modify
+
+        print "Test Begin....."
+        self.OnosConnectionSet()
+        masterhandle = self.SSHlogin(self.localhost, self.masterusername,
+                                     self.masterpassword)
+        self.OnosEnvSetup(masterhandle)
+        return masterhandle
+
+    def onosclean(self, handle):
+        self.SSHRelease(handle)
+        self.loginfo.log('Release onos handle Successful')
+
+    def push_results_to_db(self, payload, pushornot=1):
+        if pushornot != 1:
+            return 1
+        url = self.Result_DB + "/results"
+        params = {"project_name": "functest", "case_name": "ONOS-" +
+                  self.testcase, "pod_name": 'huawei-build-2',
+                  "details": payload}
+
+        headers = {'Content-Type': 'application/json'}
+        try:
+            r = requests.post(url, data=json.dumps(params), headers=headers)
+            self.loginfo.log(r)
+        except:
+            self.loginfo.log('Error pushing results into Database')
diff --git a/testcases/Controllers/ONOS/Teston/adapters/connection.py b/testcases/Controllers/ONOS/Teston/adapters/connection.py
new file mode 100644
index 00000000..16f2ef32
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/adapters/connection.py
@@ -0,0 +1,196 @@
+"""
+Description:
+    This file is used to make connections
+    Include ssh & exchange public-key to each other so that
+    it can run without password
+
+    lanqinglong@huawei.com
+
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+import os
+import pexpect
+import re
+from foundation import foundation
+
+
+class connection(foundation):
+
+    def __init__(self):
+        foundation.__init__(self)
+        self.loginfo = foundation()
+
+    def AddKnownHost(self, handle, ipaddr, username, password):
+        """
+        Add an user to known host,so that onos can login in with onos $ipaddr.
+        parameters:
+        ipaddr:   ip address
+        username: login user name
+        password: login password
+        """
+        print("Now Adding an user to known hosts " + ipaddr)
+        login = handle
+        login.sendline("ssh -l %s -p 8101 %s" % (username, ipaddr))
+        index = 0
+        while index != 2:
+            index = login.expect(['assword:', 'yes/no', pexpect.EOF,
+                                  pexpect.TIMEOUT])
+            if index == 0:
+                login.sendline(password)
+                login.sendline("logout")
+                index = login.expect(["closed", pexpect.EOF])
+                if index == 0:
+                    self.loginfo.log("Add SSH Known Host Success!")
+                    break
+                else:
+                    self.loginfo.log("Add SSH Known Host Failed! "
+                                     "Please Check!")
+                    break
+                login.prompt()
+
+            if index == 1:
+                login.sendline('yes')
+
+    def GetEnvValue(self, handle, envname):
+        """
+        os.getenv only returns current user value
+        GetEnvValue returns a environment value of
+            current handle
+        eg: GetEnvValue(handle,'HOME')
+        """
+        envhandle = handle
+        envhandle.sendline('echo $' + envname)
+        envhandle.prompt()
+        reg = envname + '\r\n(.*)\r'
+        envaluereg = re.compile(reg)
+        envalue = envaluereg.search(envhandle.before)
+        if envalue:
+            return envalue.groups()[0]
+        else:
+            return None
+
+    def Gensshkey(self, handle):
+        """
+        Generate ssh keys, used for some server have no sshkey.
+        """
+        print "Now Generating SSH keys..."
+        # Here file name may be id_rsa or id_ecdsa or others
+        # So here will have a judgement
+        keysub = handle
+        filepath = self.GetEnvValue(keysub, 'HOME') + '/.ssh'
+        filelist = os.listdir(filepath)
+        for item in filelist:
+            if 'id' in item:
+                self.loginfo.log("SSH keys are exsit in ssh directory.")
+                return True
+        keysub.sendline("ssh-keygen -t rsa")
+        Result = 0
+        while Result != 2:
+            Result = keysub.expect(["Overwrite", "Enter", pexpect.EOF,
+                                    'PEXPECT]#', pexpect.TIMEOUT])
+            if Result == 0:
+                keysub.sendline("y")
+            if Result == 1 or Result == 2:
+                keysub.sendline("\n")
+            if Result == 3:
+                self.loginfo.log("Generate SSH key success.")
+                keysub.prompt()
+                break
+            if Result == 4:
+                self.loginfo.log("Generate SSH key failed.")
+                keysub.prompt()
+                break
+
+    def GetRootAuth(self, password):
+        """
+        Get root user
+        parameters:
+        password: root login password
+        """
+        print("Now changing to user root")
+        login = pexpect.spawn("su - root")
+        index = 0
+        while index != 2:
+            index = login.expect(['assword:', "failure",
+                                  pexpect.EOF, pexpect.TIMEOUT])
+            if index == 0:
+                login.sendline(password)
+            if index == 1:
+                self.loginfo.log("Change user to root failed.")
+
+        login.interact()
+
+    def ReleaseRootAuth(self):
+        """
+        Exit root user.
+        """
+        print("Now Release user root")
+        login = pexpect.spawn("exit")
+        index = login.expect(['logout', pexpect.EOF, pexpect.TIMEOUT])
+        if index == 0:
+            self.loginfo.log("Release root user success.")
+        if index == 1:
+            self.loginfo.log("Release root user failed.")
+
+        login.interact()
+
+    def AddEnvIntoBashrc(self, envalue):
+        """
+        Add Env var into /etc/profile.
+        parameters:
+        envalue: environment value to add
+        """
+        print "Now Adding bash environment"
+        fileopen = open("/etc/profile", 'r')
+        findContext = 1
+        while findContext:
+            findContext = fileopen.readline()
+            result = findContext.find(envalue)
+            if result != -1:
+                break
+        fileopen.close
+        if result == -1:
+            envAdd = open("/etc/profile", 'a+')
+            envAdd.writelines("\n" + envalue)
+            envAdd.close()
+        self.loginfo.log("Add env to bashrc success!")
+
+    def OnosRootPathChange(self, onospath):
+        """
+        Change ONOS root path in file:bash_profile
+        onospath: path of onos root
+        """
+        print "Now Changing ONOS Root Path"
+        filepath = onospath + 'onos/tools/dev/bash_profile'
+        line = open(filepath, 'r').readlines()
+        lenall = len(line) - 1
+        for i in range(lenall):
+            if "export ONOS_ROOT" in line[i]:
+                line[i] = 'export ONOS_ROOT=' + onospath + 'onos\n'
+        NewFile = open(filepath, 'w')
+        NewFile.writelines(line)
+        NewFile.close
+        print "Done!"
+
+    def OnosConnectionSet(self):
+        """
+        Intergrate for ONOS connection setup
+        """
+        if self.masterusername == 'root':
+            filepath = '/root/'
+        else:
+            filepath = '/home/' + self.masterusername + '/'
+        filepath = os.path.join(filepath, "onos/tools/dev/bash_profile")
+        self.AddEnvIntoBashrc("source " + filepath + "\n")
+        self.AddEnvIntoBashrc("export OCT=" + self.OCT)
+        self.AddEnvIntoBashrc("export OC1=" + self.OC1)
+        self.AddEnvIntoBashrc("export OC2=" + self.OC2)
+        self.AddEnvIntoBashrc("export OC3=" + self.OC3)
+        self.AddEnvIntoBashrc("export OCN=" + self.OCN)
+        self.AddEnvIntoBashrc("export OCN2=" + self.OCN2)
+        self.AddEnvIntoBashrc("export localhost=" + self.localhost)
diff --git a/testcases/Controllers/ONOS/Teston/adapters/environment.py b/testcases/Controllers/ONOS/Teston/adapters/environment.py
new file mode 100644
index 00000000..49f7f963
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/adapters/environment.py
@@ -0,0 +1,281 @@
+"""
+Description:
+    This file is used to setup the running environment
+    Include Download code,setup environment variable
+            Set onos running config
+            Set user name/password
+            Onos-push-keys and so on
+    lanqinglong@huawei.com
+
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+
+import os
+import time
+import pexpect
+import re
+import sys
+import pxssh
+from connection import connection
+
+
+class environment(connection):
+
+    def __init__(self):
+        connection.__init__(self)
+        self.loginfo = connection()
+        self.masterhandle = ''
+        self.home = ''
+
+    def DownLoadCode(self, handle, codeurl):
+        """
+        Download Code use 'git clone'
+        parameters:
+        handle:  current working handle
+        codeurl: clone code url
+        """
+        print "Now loading test codes! Please wait in patient..."
+        originalfolder = sys.path[0]
+        print originalfolder
+        gitclone = handle
+        gitclone.sendline("git clone " + codeurl)
+        index = 0
+        # increment = 0
+        while index != 1 or index != 4:
+            index = gitclone.expect(['already exists',
+                                     'esolving deltas: 100%',
+                                     'eceiving objects',
+                                     'Already up-to-date',
+                                     'npacking objects: 100%', pexpect.EOF])
+
+            filefolder = self.home + '/' + codeurl.split('/')[-1].split('.')[0]
+            if index == 0:
+                os.chdir(filefolder)
+                os.system('git pull')
+                os.chdir(originalfolder)
+                self.loginfo.log('Download code success!')
+                break
+            elif index == 1 or index == 4:
+                self.loginfo.log('Download code success!')
+                gitclone.sendline("mkdir onos")
+                gitclone.prompt()
+                gitclone.sendline("cp -rf " + filefolder + "/tools onos/")
+                gitclone.prompt()
+                break
+            elif index == 2:
+                os.write(1, gitclone.before)
+                sys.stdout.flush()
+            else:
+                self.loginfo.log('Download code failed!')
+                self.loginfo.log('Information before' + gitclone.before)
+                break
+        gitclone.prompt()
+
+    def InstallDefaultSoftware(self, handle):
+        """
+        Install default software
+        parameters:
+        handle(input): current working handle
+        """
+        print "Now Cleaning test environment"
+        handle.sendline("sudo apt-get install -y mininet")
+        handle.prompt()
+        handle.sendline("sudo pip install configobj")
+        handle.prompt()
+        handle.sendline("sudo apt-get install -y sshpass")
+        handle.prompt()
+        handle.sendline("OnosSystemTest/TestON/bin/cleanup.sh")
+        handle.prompt()
+        time.sleep(5)
+        self.loginfo.log('Clean environment success!')
+
+    def OnosPushKeys(self, handle, cmd, password):
+        """
+        Using onos-push-keys to make ssh device without password
+        parameters:
+        handle(input): working handle
+        cmd(input): onos-push-keys xxx(xxx is device)
+        password(input): login in password
+        """
+        print "Now Pushing Onos Keys:" + cmd
+        Pushkeys = handle
+        Pushkeys.sendline(cmd)
+        Result = 0
+        while Result != 2:
+            Result = Pushkeys.expect(["(yes/no)", "assword:", "PEXPECT]#",
+                                      pexpect.EOF, pexpect.TIMEOUT])
+            if(Result == 0):
+                Pushkeys.sendline("yes")
+            if(Result == 1):
+                Pushkeys.sendline(password)
+            if(Result == 2):
+                self.loginfo.log("ONOS Push keys Success!")
+                break
+            if(Result == 3):
+                self.loginfo.log("ONOS Push keys Error!")
+                break
+            time.sleep(2)
+        Pushkeys.prompt()
+        print "Done!"
+
+    def SetOnosEnvVar(self, handle, masterpass, agentpass):
+        """
+        Setup onos pushkeys to all devices(3+2)
+        parameters:
+        handle(input): current working handle
+        masterpass: scripts running server's password
+        agentpass: onos cluster&compute node password
+        """
+        print "Now Setting test environment"
+        for host in self.hosts:
+            print "try to connect " + str(host)
+            result = self.CheckSshNoPasswd(host)
+            if not result:
+                print ("ssh lgin failed,try to copy master publickey" +
+                       "to agent " + str(host))
+                self.CopyPublicKey(host)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OCT, masterpass)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OC1, agentpass)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OC2, agentpass)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OC3, agentpass)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OCN, agentpass)
+        self.OnosPushKeys(handle, "onos-push-keys " + self.OCN2, agentpass)
+
+    def CheckSshNoPasswd(self, host):
+        """
+        Check master can connect agent with no password
+        """
+        login = pexpect.spawn("ssh " + str(host))
+        index = 4
+        while index == 4:
+            index = login.expect(['(yes/no)', '>|#|\$',
+                                  pexpect.EOF, pexpect.TIMEOUT])
+            if index == 0:
+                login.sendline("yes")
+                index = 4
+            if index == 1:
+                self.loginfo.log("ssh connect to " + str(host) +
+                                 " success,no need to copy ssh public key")
+                return True
+        login.interact()
+        return False
+
+    def ChangeOnosName(self, user, password):
+        """
+        Change onos name in envDefault file
+        Because some command depend on this
+        parameters:
+        user: onos&compute node user
+        password: onos&compute node password
+        """
+        print "Now Changing ONOS name&password"
+        filepath = self.home + '/onos/tools/build/envDefaults'
+        line = open(filepath, 'r').readlines()
+        lenall = len(line) - 1
+        for i in range(lenall):
+            if "ONOS_USER=" in line[i]:
+                line[i] = line[i].replace("sdn", user)
+            if "ONOS_GROUP" in line[i]:
+                line[i] = line[i].replace("sdn", user)
+            if "ONOS_PWD" in line[i]:
+                line[i] = line[i].replace("rocks", password)
+        NewFile = open(filepath, 'w')
+        NewFile.writelines(line)
+        NewFile.close
+        print "Done!"
+
+    def ChangeTestCasePara(self, testcase, user, password):
+        """
+        When running test script, there's something need \
+        to change in every test folder's *.param & *.topo files
+        user: onos&compute node user
+        password: onos&compute node password
+        """
+        print "Now Changing " + testcase + " name&password"
+        if self.masterusername == 'root':
+            filepath = '/root/'
+        else:
+            filepath = '/home/' + self.masterusername + '/'
+        filepath = (filepath + "OnosSystemTest/TestON/tests/" +
+                    testcase + "/" + testcase + ".topo")
+        line = open(filepath, 'r').readlines()
+        lenall = len(line) - 1
+        for i in range(lenall - 2):
+            if("localhost" in line[i]) or ("OCT" in line[i]):
+                line[i + 1] = re.sub(">\w+", ">" + user, line[i + 1])
+                line[i + 2] = re.sub(">\w+", ">" + password, line[i + 2])
+            if ("OC1" in line[i] or "OC2" in line[i] or "OC3" in line[i] or
+                    "OCN" in line[i] or "OCN2" in line[i]):
+                line[i + 1] = re.sub(">\w+", ">root", line[i + 1])
+                line[i + 2] = re.sub(">\w+", ">root", line[i + 2])
+        NewFile = open(filepath, 'w')
+        NewFile.writelines(line)
+        NewFile.close
+
+    def SSHlogin(self, ipaddr, username, password):
+        """
+        SSH login provide a connection to destination.
+        parameters:
+        ipaddr:   ip address
+        username: login user name
+        password: login password
+        return: handle
+        """
+        login = pxssh.pxssh()
+        login.login(ipaddr, username, password, original_prompt='[$#>]')
+        # send command ls -l
+        login.sendline('ls -l')
+        # match prompt
+        login.prompt()
+        print("SSH login " + ipaddr + " success!")
+        return login
+
+    def SSHRelease(self, handle):
+        # Release ssh
+        handle.logout()
+
+    def CopyOnostoTestbin(self):
+        sourcefile = self.cipath + '/dependencies/onos'
+        destifile = self.home + '/onos/tools/test/bin/'
+        os.system('pwd')
+        runcommand = 'cp ' + sourcefile + ' ' + destifile
+        os.system(runcommand)
+
+    def CopyPublicKey(self, host):
+        output = os.popen('cat /root/.ssh/id_rsa.pub')
+        publickey = output.read().strip('\n')
+        tmphandle = self.SSHlogin(self.installer_master,
+                                  self.installer_master_username,
+                                  self.installer_master_password)
+        tmphandle.sendline("ssh " + host + " -T \'echo " +
+                           str(publickey) + ">>/root/.ssh/authorized_keys\'")
+        tmphandle.prompt()
+        self.SSHRelease(tmphandle)
+        print "Add OCT PublicKey to " + host + " success"
+
+    def OnosEnvSetup(self, handle):
+        """
+        Onos Environment Setup function
+        """
+        self.Gensshkey(handle)
+        self.home = self.GetEnvValue(handle, 'HOME')
+        self.AddKnownHost(handle, self.OC1, "karaf", "karaf")
+        self.AddKnownHost(handle, self.OC2, "karaf", "karaf")
+        self.AddKnownHost(handle, self.OC3, "karaf", "karaf")
+        self.DownLoadCode(handle,
+                          'https://github.com/sunyulin/OnosSystemTest.git')
+        # self.DownLoadCode(handle, 'https://gerrit.onosproject.org/onos')
+        if self.masterusername == 'root':
+            filepath = '/root/'
+        else:
+            filepath = '/home/' + self.masterusername + '/'
+        self.OnosRootPathChange(filepath)
+        self.CopyOnostoTestbin()
+        self.ChangeOnosName(self.agentusername, self.agentpassword)
+        self.InstallDefaultSoftware(handle)
+        self.SetOnosEnvVar(handle, self.masterpassword, self.agentpassword)
diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py
new file mode 100644
index 00000000..47605eb7
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py
@@ -0,0 +1,104 @@
+"""
+Description:
+    This file include basis functions
+    lanqinglong@huawei.com
+
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+
+import logging
+import os
+import time
+import yaml
+import re
+import datetime
+
+
+class foundation:
+
+    def __init__(self):
+
+        # currentpath = os.getcwd()
+        REPO_PATH = os.environ['repos_dir'] + '/functest/'
+        currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI'
+        self.cipath = currentpath
+        self.logdir = os.path.join(currentpath, 'log')
+        self.workhome = currentpath[0: currentpath.rfind('testcases') - 1]
+        self.Result_DB = ''
+        filename = time.strftime('%Y-%m-%d-%H-%M-%S') + '.log'
+        self.logfilepath = os.path.join(self.logdir, filename)
+        self.starttime = datetime.datetime.now()
+
+    def log(self, loginfo):
+        """
+        Record log in log directory for deploying test environment
+        parameters:
+        loginfo(input): record info
+        """
+        logging.basicConfig(level=logging.INFO,
+                            format='%(asctime)s %(filename)s:%(message)s',
+                            datefmt='%d %b %Y %H:%M:%S',
+                            filename=self.logfilepath,
+                            filemode='w')
+        filelog = logging.FileHandler(self.logfilepath)
+        logging.getLogger('Functest').addHandler(filelog)
+        print loginfo
+        logging.info(loginfo)
+
+    def getdefaultpara(self):
+        """
+        Get Default Parameters value
+        """
+        with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
+            functest_yaml = yaml.safe_load(f)
+
+        self.Result_DB = str(functest_yaml.get("results").get("test_db_url"))
+        self.masterusername = str(functest_yaml.get("ONOS").get("general").
+                                  get('onosbench_username'))
+        self.masterpassword = str(functest_yaml.get("ONOS").get("general").
+                                  get("onosbench_password"))
+        self.agentusername = str(functest_yaml.get("ONOS").get("general").
+                                 get("onoscli_username"))
+        self.agentpassword = str(functest_yaml.get("ONOS").get("general").
+                                 get("onoscli_password"))
+        self.runtimeout = functest_yaml.get("ONOS").get("general").get(
+            "runtimeout")
+        self.OCT = str(functest_yaml.get("ONOS").get("environment").get("OCT"))
+        self.OC1 = str(functest_yaml.get("ONOS").get("environment").get("OC1"))
+        self.OC2 = str(functest_yaml.get("ONOS").get("environment").get("OC2"))
+        self.OC3 = str(functest_yaml.get("ONOS").get("environment").get("OC3"))
+        self.OCN = str(functest_yaml.get("ONOS").get("environment").get("OCN"))
+        self.OCN2 = str(functest_yaml.get("ONOS").
+                        get("environment").get("OCN2"))
+        self.installer_master = str(functest_yaml.get("ONOS").
+                                    get("environment").get("installer_master"))
+        self.installer_master_username = str(functest_yaml.get("ONOS").
+                                             get("environment").
+                                             get("installer_master_username"))
+        self.installer_master_password = str(functest_yaml.get("ONOS").
+                                             get("environment").
+                                             get("installer_master_password"))
+        self.hosts = [self.OC1, self.OCN, self.OCN2]
+        self.localhost = self.OCT
+
+    def GetResult(self):
+        cmd = "cat " + self.logfilepath + " | grep Fail"
+        Resultbuffer = os.popen(cmd).read()
+        duration = datetime.datetime.now() - self.starttime
+        time.sleep(2)
+
+        if re.search("[1-9]+", Resultbuffer):
+            self.log("Testcase Fails\n" + Resultbuffer)
+            Result = "POK"
+        else:
+            self.log("Testcases Pass")
+            Result = "OK"
+        payload = {'timestart': str(self.starttime),
+                   'duration': str(duration), 'status': Result}
+
+        return payload
diff --git a/testcases/Controllers/ONOS/Teston/dependencies/onos b/testcases/Controllers/ONOS/Teston/dependencies/onos
new file mode 100644
index 00000000..bb02fa89
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/dependencies/onos
@@ -0,0 +1,29 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# ONOS remote command-line client.
+# -----------------------------------------------------------------------------
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. /root/.bashrc
+. $ONOS_ROOT/tools/build/envDefaults
+. $ONOS_ROOT/tools/test/bin/find-node.sh
+
+[ "$1" = "-w" ] && shift && onos-wait-for-start $1
+
+[ -n "$1" ] && OCI=$(find_node $1) && shift
+
+if which client 1>/dev/null 2>&1 && [ -z "$ONOS_USE_SSH" ]; then
+    # Use Karaf client only if we can and are allowed to
+    unset KARAF_HOME
+    client -h $OCI -u karaf "$@" 2>/dev/null
+else
+    # Otherwise use raw ssh; strict checking is off for dev environments only
+    #ssh -p 8101 -o StrictHostKeyChecking=no $OCI "$@"
+    sshpass -p karaf ssh -l karaf -p 8101 $OCI "$@"
+fi
diff --git a/testcases/Controllers/ONOS/Teston/log/gitignore b/testcases/Controllers/ONOS/Teston/log/gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
new file mode 100644
index 00000000..07ecacc5
--- /dev/null
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -0,0 +1,208 @@
+"""
+Description: This test is to run onos Teston VTN scripts
+
+List of test cases:
+CASE1 - Northbound NBI test network/subnet/ports
+CASE2 - Ovsdb test&Default configuration&Vm go online
+
+lanqinglong@huawei.com
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+
+import argparse
+import datetime
+import os
+import re
+import time
+import yaml
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.functest_utils as functest_utils
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-i", "--installer", help="Installer type")
+args = parser.parse_args()
+""" logging configuration """
+logger = ft_logger.Logger("onos").getLogger()
+
+with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
+    functest_yaml = yaml.safe_load(f)
+f.close()
+
+# onos parameters
+TEST_DB = functest_yaml.get("results").get("test_db_url")
+ONOS_REPO_PATH = functest_yaml.get("general").get("directories").get(
+    "dir_repos")
+ONOS_CONF_DIR = functest_yaml.get("general").get("directories").get(
+    "dir_functest_conf")
+REPO_PATH = ONOS_REPO_PATH + '/functest/'
+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/'
+starttime = datetime.datetime.now()
+
+HOME = os.environ['HOME'] + "/"
+
+
+def RunScript(testname):
+    """
+    Run ONOS Test Script
+    Parameters:
+    testname: ONOS Testcase Name
+    """
+    runtest = ONOSCI_PATH + "OnosSystemTest/TestON/bin/cli.py run " + testname
+    logger.debug("Run script " + testname)
+    os.system(runtest)
+
+
+def DownloadCodes(url="https://github.com/sunyulin/OnosSystemTest.git"):
+    """
+    Download Onos Teston codes
+    Parameters:
+    url: github url
+    """
+    downloadcode = "git clone " + url + " " + ONOSCI_PATH + "OnosSystemTest"
+    logger.debug("Download Onos Teston codes " + url)
+    os.system(downloadcode)
+
+
+def GetResult():
+    LOGPATH = ONOSCI_PATH + "OnosSystemTest/TestON/logs"
+    cmd = "grep -rnh " + "Fail" + " " + LOGPATH
+    Resultbuffer = os.popen(cmd).read()
+    # duration = datetime.datetime.now() - starttime
+    time.sleep(2)
+
+    if re.search("\s+[1-9]+\s+", Resultbuffer):
+        logger.debug("Testcase Fails\n" + Resultbuffer)
+        # Result = "Failed"
+    else:
+        logger.debug("Testcases Success")
+        # Result = "Success"
+    # payload={'timestart': str(starttime),
+    #          'duration': str(duration),
+    #            'status': Result}
+    cmd = "grep -rnh 'Execution Time' " + LOGPATH
+    Resultbuffer = os.popen(cmd).read()
+    time1 = Resultbuffer[114:128]
+    time2 = Resultbuffer[28:42]
+    cmd = "grep -rnh 'Success Percentage' " + LOGPATH + "/FUNCvirNetNB_*"
+    Resultbuffer = os.popen(cmd).read()
+    if Resultbuffer.find('100%') >= 0:
+        result1 = 'Success'
+    else:
+        result1 = 'Failed'
+    cmd = "grep -rnh 'Success Percentage' " + LOGPATH + "/FUNCvirNetNBL3*"
+    Resultbuffer = os.popen(cmd).read()
+    if Resultbuffer.find('100%') >= 0:
+        result2 = 'Success'
+    else:
+        result2 = 'Failed'
+    status1 = []
+    status2 = []
+    cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNB_*"
+    Resultbuffer = os.popen(cmd).read()
+    pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
+    # res = pattern.search(Resultbuffer).groups()
+    res = pattern.findall(Resultbuffer)
+    i = 0
+    for index in range(len(res)):
+        status1.append({'Case name:': res[i][0] + res[i][1],
+                        'Case result': res[i][2]})
+        i = i + 1
+    cmd = "grep -rnh 'h3' " + LOGPATH + "/FUNCvirNetNBL3*"
+    Resultbuffer = os.popen(cmd).read()
+    pattern = re.compile("<h3>([^-]+) - ([^-]+) - (\S*)</h3>")
+    # res = pattern.search(Resultbuffer).groups()
+    res = pattern.findall(Resultbuffer)
+    i = 0
+    for index in range(len(res)):
+        status2.append({'Case name:': res[i][0] + res[i][1],
+                        'Case result': res[i][2]})
+        i = i + 1
+    payload = {'timestart': str(starttime),
+               'FUNCvirNet': {'duration': time1,
+                              'result': result1,
+                              'status': status1},
+               'FUNCvirNetL3': {'duration': time2,
+                                'result': result2,
+                                'status': status2}}
+    return payload
+
+
+def SetOnosIp():
+    cmd = "openstack catalog show network | grep publicURL"
+    cmd_output = os.popen(cmd).read()
+    OC1 = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
+    os.environ['OC1'] = OC1
+    time.sleep(2)
+    logger.debug("ONOS IP is " + OC1)
+
+
+def SetOnosIpForJoid():
+    cmd = "env | grep SDN_CONTROLLER"
+    cmd_output = os.popen(cmd).read()
+    OC1 = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
+    os.environ['OC1'] = OC1
+    time.sleep(2)
+    logger.debug("ONOS IP is " + OC1)
+
+
+def CleanOnosTest():
+    TESTONPATH = ONOSCI_PATH + "OnosSystemTest/"
+    cmd = "rm -rf " + TESTONPATH
+    os.system(cmd)
+    time.sleep(2)
+    logger.debug("Clean ONOS Teston")
+
+
+def main():
+
+    DownloadCodes()
+    if args.installer == "joid":
+        logger.debug("Installer is Joid")
+        SetOnosIpForJoid()
+    else:
+        SetOnosIp()
+    RunScript("FUNCvirNetNB")
+    RunScript("FUNCvirNetNBL3")
+
+    try:
+        logger.debug("Push result into DB")
+        # TODO check path result for the file
+        scenario = functest_utils.get_scenario(logger)
+        version = functest_utils.get_version(logger)
+        result = GetResult()
+
+        # ONOS success criteria = all tests OK
+        # i.e. FUNCvirNet & FUNCvirNetL3
+        status = "failed"
+        try:
+            if (result['FUNCvirNet']['result'] == "Success" and
+                    result['FUNCvirNetL3']['result'] == "Success"):
+                    status = "passed"
+        except:
+            logger.error("Unable to set ONOS criteria")
+
+        pod_name = functest_utils.get_pod_name(logger)
+        build_tag = functest_utils.get_build_tag(logger)
+        functest_utils.push_results_to_db(TEST_DB,
+                                          "functest",
+                                          "ONOS",
+                                          logger, pod_name, version, scenario,
+                                          status, build_tag, payload=result)
+    except:
+        logger.error("Error pushing results into Database")
+
+    CleanOnosTest()
+
+
+if __name__ == '__main__':
+    main()
-- 
cgit 1.2.3-korg