diff options
author | pmikus <pmikus@cisco.com> | 2016-10-06 10:44:15 +0100 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2016-10-14 18:08:02 +0000 |
commit | 61b9af12c182d40cbeede66c2c9ec52c616fab03 (patch) | |
tree | 6e297ce540d9247382d15f617b0a3a050dac8b1b /resources | |
parent | 909f20348b5aac1207678d1c0af8bbfa50f716c6 (diff) |
CSIT-351: Testing Ubuntu 16.04.1 changes
- Update the repository to get xenial packages
- Update phy topology files with new pass
- Update bootstrap to use new VIRL image
- Update framework to reflect 16.04 dependencies
- CSIT-116: Modify VIRL username/password
Change-Id: I4de44755170fd0481acef34c7c2d9c299bc300da
Signed-off-by: pmikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r-- | resources/libraries/python/SetupFramework.py | 3 | ||||
-rw-r--r-- | resources/libraries/python/TrafficScriptExecutor.py | 3 | ||||
-rw-r--r-- | resources/libraries/python/VppConfigGenerator.py | 4 | ||||
-rw-r--r-- | resources/libraries/robot/qemu.robot | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index d0059ebed8..5d3d59ab56 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -112,7 +112,8 @@ def create_env_directory_at_node(node): ssh = SSH() ssh.connect(node) (ret_code, stdout, stderr) = ssh.exec_command( - 'cd {0} && rm -rf env && virtualenv --system-site-packages env && ' + 'cd {0} && rm -rf env && ' + 'virtualenv --system-site-packages --never-download env && ' '. env/bin/activate && ' 'pip install -r requirements.txt' .format(con.REMOTE_FW_DIR), timeout=100) diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index 33b3d6d520..58d48d3ca9 100644 --- a/resources/libraries/python/TrafficScriptExecutor.py +++ b/resources/libraries/python/TrafficScriptExecutor.py @@ -58,7 +58,8 @@ class TrafficScriptExecutor(object): logger.trace("{}".format(timeout)) ssh = SSH() ssh.connect(node) - cmd = ("cd {}; virtualenv --system-site-packages env && " + + cmd = ("cd {}; " + + "virtualenv --system-site-packages --never-download env && " + "export PYTHONPATH=${{PWD}}; " + ". ${{PWD}}/env/bin/activate; " + "resources/traffic_scripts/{} {}") \ diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index d4ef04e65c..099d07636b 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -424,9 +424,9 @@ class VppConfigGenerator(object): # Instead of restarting, we'll do separate start and stop # actions. This way we don't care whether VPP was running # to begin with. - ssh.exec_command('sudo initctl stop {}'.format(VPP_SERVICE_NAME)) + ssh.exec_command('sudo service {} stop'.format(VPP_SERVICE_NAME)) (ret, stdout, stderr) = \ - ssh.exec_command('sudo initctl start {}'.format(VPP_SERVICE_NAME)) + ssh.exec_command('sudo service {} start'.format(VPP_SERVICE_NAME)) if ret != 0: logger.debug('Restarting VPP failed on node {}'. format(hostname)) diff --git a/resources/libraries/robot/qemu.robot b/resources/libraries/robot/qemu.robot index a9cf0101a5..989b73e531 100644 --- a/resources/libraries/robot/qemu.robot +++ b/resources/libraries/robot/qemu.robot @@ -64,10 +64,7 @@ | | ... | returned by qemu_start or None. | | [Arguments] | ${dut} | ${vm} | | Qemu Set Node | ${dut} -| | ${status} | ${value}= | Run Keyword And Ignore Error | Qemu System Status -| | Run Keyword If | "${status}" == "FAIL" | Qemu Kill -| | ... | ELSE IF | "${value}" == "running" | Qemu System Powerdown -| | ... | ELSE | Qemu Quit +| | Qemu Kill | | Qemu Clear Socks | | Run Keyword If | ${vm} is not None | Disconnect | ${vm} |