diff options
author | Peter Mikus <pmikus@cisco.com> | 2018-07-01 06:13:54 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-07-02 09:10:09 +0000 |
commit | a28f1efe6803b70c3e2d2bdb74d55c88ffa8f9e1 (patch) | |
tree | cc87a4d85f4f5312ceba68724d2e752666233df0 /resources/libraries/python/SetupFramework.py | |
parent | 8a5ef28ce07926ea81337ef7a997a2cf19e3cb4a (diff) |
Compatibility fixes with Ubuntu 18.04
Currently we are using ip:port socket to for VPP to listen for incoming
connections. There is only one place in code this socket is used for
detection if VPP is responding after restart. This patch is supposed to
change ip:port to sock:file which is default preffered way in VPP. This
way we can start using vppctl. netcat on the other side with ip:port
remains hanged in console for infinite time not returning back.
There is also need to check whether uio_module is loaded and eventually
load it. As uio_pci_generic is not working there, we will fallback to
main igb_uio (uio_pci_generic being only lightweight subset of igb_uio).
This patch also add additional verbose output to console during setup to
better understand if failure happens during copy/extract/setup.
Change-Id: I0b8a3b76dce3316496a3ad928f58718b6e73057d
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python/SetupFramework.py')
-rw-r--r-- | resources/libraries/python/SetupFramework.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index ccf4e4fada..558d5d4097 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -84,6 +84,7 @@ def copy_tarball_to_node(tarball, node): ssh.connect(node) ssh.scp(tarball, "/tmp/") + logger.console('Copying tarball to {0} done'.format(node['host'])) def extract_tarball_at_node(tarball, node): @@ -108,6 +109,8 @@ def extract_tarball_at_node(tarball, node): if ret_code != 0: raise RuntimeError('Failed to extract {0} at node {1}' .format(tarball, node['host'])) + logger.console('Extracting tarball to {0} on {1} done' + .format(con.REMOTE_FW_DIR, node['host'])) def create_env_directory_at_node(node): @@ -131,8 +134,8 @@ def create_env_directory_at_node(node): if ret_code != 0: raise RuntimeError('Virtualenv setup including requirements.txt on {0}' .format(node['host'])) - else: - logger.console('Virtualenv on {0} created'.format(node['host'])) + + logger.console('Virtualenv on {0} created'.format(node['host'])) def setup_node(args): |