Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-811 HC Test: BGP functional tests
[csit.git]
/
resources
/
libraries
/
python
/
SetupFramework.py
diff --git
a/resources/libraries/python/SetupFramework.py
b/resources/libraries/python/SetupFramework.py
index
d0059eb
..
a528f68
100644
(file)
--- a/
resources/libraries/python/SetupFramework.py
+++ b/
resources/libraries/python/SetupFramework.py
@@
-50,7
+50,8
@@
def pack_framework_dir():
tmpfile.close()
proc = Popen(
tmpfile.close()
proc = Popen(
- split("tar --exclude-vcs --exclude=./tmp --exclude=*.deb -zcf {0} .".
+ split("tar --sparse --exclude-vcs "
+ "--exclude=./tmp --exclude=*.deb -zcf {0} .".
format(file_name)), stdout=PIPE, stderr=PIPE)
(stdout, stderr) = proc.communicate()
format(file_name)), stdout=PIPE, stderr=PIPE)
(stdout, stderr) = proc.communicate()
@@
-71,7
+72,7
@@
def copy_tarball_to_node(tarball, node):
:param node: Dictionary created from topology.
:type tarball: str
:type node: dict
:param node: Dictionary created from topology.
:type tarball: str
:type node: dict
- :return: nothing
+ :return
s
: nothing
"""
logger.console('Copying tarball to {0}'.format(node['host']))
ssh = SSH()
"""
logger.console('Copying tarball to {0}'.format(node['host']))
ssh = SSH()
@@
-89,7
+90,7
@@
def extract_tarball_at_node(tarball, node):
:param node: Dictionary created from topology.
:type tarball: str
:type node: dict
:param node: Dictionary created from topology.
:type tarball: str
:type node: dict
- :return: nothing
+ :return
s
: nothing
"""
logger.console('Extracting tarball to {0} on {1}'.format(
con.REMOTE_FW_DIR, node['host']))
"""
logger.console('Extracting tarball to {0} on {1}'.format(
con.REMOTE_FW_DIR, node['host']))
@@
-112,7
+113,8
@@
def create_env_directory_at_node(node):
ssh = SSH()
ssh.connect(node)
(ret_code, stdout, stderr) = ssh.exec_command(
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)
'. env/bin/activate && '
'pip install -r requirements.txt'
.format(con.REMOTE_FW_DIR), timeout=100)
@@
-132,8
+134,7
@@
def setup_node(args):
:param args: All parameters needed to setup one node.
:type args: tuple
: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
:rtype: bool
"""
tarball, remote_tarball, node = args
@@
-155,12
+156,12
@@
def delete_local_tarball(tarball):
:param tarball: Path to tarball to upload.
:type tarball: str
:param tarball: Path to tarball to upload.
:type tarball: str
- :return: nothing
+ :return
s
: nothing
"""
call(split('sh -c "rm {0} > /dev/null 2>&1"'.format(tarball)))
"""
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
"""Setup suite run on topology nodes.
Many VAT/CLI based tests need the scripts at remote hosts before executing
@@
-198,4
+199,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')
logger.trace('Test framework copied to all topology nodes')
delete_local_tarball(tarball)
logger.console('All nodes are ready')
-