X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FSetupFramework.py;h=82c4ae2a65561e26a10f8f98e838029a6fb769be;hp=d03531700691cb2258178bf29578adff0b1c2435;hb=a060d519d0a89574f5e75d4e8d4c142fa5687555;hpb=56a9ea7e421100594d8be68c0ff15236f5c50a6e

diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index d035317006..82c4ae2a65 100644
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -38,11 +38,11 @@ def pack_framework_dir():
 
     try:
         directory = environ["TMPDIR"]
-    except Keyerror:
+    except KeyError:
         directory = None
 
     if directory is not None:
-        tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-",\
+        tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-",
                                      dir="{0}".format(directory))
     else:
         tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-")
@@ -50,15 +50,15 @@ def pack_framework_dir():
     tmpfile.close()
 
     proc = Popen(
-        split("tar --exclude-vcs -zcf {0} .".format(file_name)),
-        stdout=PIPE, stderr=PIPE)
+        split("tar --exclude-vcs --exclude=./tmp --exclude=*.deb -zcf {0} .".
+              format(file_name)), stdout=PIPE, stderr=PIPE)
     (stdout, stderr) = proc.communicate()
 
     logger.debug(stdout)
     logger.debug(stderr)
 
     return_code = proc.wait()
-    if 0 != return_code:
+    if return_code != 0:
         raise Exception("Could not pack testing framework.")
 
     return file_name
@@ -71,7 +71,7 @@ def copy_tarball_to_node(tarball, node):
     :param node: Dictionary created from topology.
     :type tarball: str
     :type node: dict
-    :return: nothing
+    :returns: nothing
     """
     logger.console('Copying tarball to {0}'.format(node['host']))
     ssh = SSH()
@@ -83,13 +83,13 @@ def copy_tarball_to_node(tarball, node):
 def extract_tarball_at_node(tarball, node):
     """Extract tarball at given node.
 
-    Extracts tarball using tar on given node to specific CSIT loocation.
+    Extracts tarball using tar on given node to specific CSIT location.
 
     :param tarball: Path to tarball to upload.
     :param node: Dictionary created from topology.
     :type tarball: str
     :type node: dict
-    :return: nothing
+    :returns: nothing
     """
     logger.console('Extracting tarball to {0} on {1}'.format(
         con.REMOTE_FW_DIR, node['host']))
@@ -99,7 +99,7 @@ def extract_tarball_at_node(tarball, node):
     cmd = 'sudo rm -rf {1}; mkdir {1} ; tar -zxf {0} -C {1}; ' \
         'rm -f {0}'.format(tarball, con.REMOTE_FW_DIR)
     (ret_code, _, stderr) = ssh.exec_command(cmd, timeout=30)
-    if 0 != ret_code:
+    if ret_code != 0:
         logger.error('Unpack error: {0}'.format(stderr))
         raise Exception('Failed to unpack {0} at node {1}'.format(
             tarball, node['host']))
@@ -112,16 +112,19 @@ 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 && . env/bin/activate && '
+        '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)
-    if 0 != ret_code:
+    if ret_code != 0:
         logger.error('Virtualenv creation error: {0}'.format(stdout + stderr))
         raise Exception('Virtualenv setup failed')
     else:
         logger.console('Virtualenv created on {0}'.format(node['host']))
 
-#pylint: disable=broad-except
+
+# pylint: disable=broad-except
 def setup_node(args):
     """Run all set-up methods for a node.
 
@@ -130,8 +133,7 @@ def setup_node(args):
 
     :param args: All parameters needed to setup one node.
     :type args: tuple
-    :return: nothing
-    :return: True - success, False - error
+    :returns: True - success, False - error
     :rtype: bool
     """
     tarball, remote_tarball, node = args
@@ -147,17 +149,18 @@ def setup_node(args):
         logger.console('Setup of node {0} done'.format(node['host']))
         return True
 
+
 def delete_local_tarball(tarball):
     """Delete local tarball to prevent disk pollution.
 
     :param tarball: Path to tarball to upload.
     :type tarball: str
-    :return: nothing
+    :returns: nothing
     """
     call(split('sh -c "rm {0} > /dev/null 2>&1"'.format(tarball)))
 
 
-class SetupFramework(object): # pylint: disable=too-few-public-methods
+class SetupFramework(object):
     """Setup suite run on topology nodes.
 
     Many VAT/CLI based tests need the scripts at remote hosts before executing
@@ -195,4 +198,3 @@ class SetupFramework(object): # pylint: disable=too-few-public-methods
         logger.trace('Test framework copied to all topology nodes')
         delete_local_tarball(tarball)
         logger.console('All nodes are ready')
-