Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Add pdf version
[csit.git]
/
resources
/
libraries
/
python
/
SetupFramework.py
diff --git
a/resources/libraries/python/SetupFramework.py
b/resources/libraries/python/SetupFramework.py
index
ccf4e4f
..
9b50b90
100644
(file)
--- a/
resources/libraries/python/SetupFramework.py
+++ b/
resources/libraries/python/SetupFramework.py
@@
-27,7
+27,7
@@
from robot.api import logger
from robot.libraries.BuiltIn import BuiltIn
from resources.libraries.python.ssh import SSH
from robot.libraries.BuiltIn import BuiltIn
from resources.libraries.python.ssh import SSH
-from resources.libraries.python.
c
onstants import Constants as con
+from resources.libraries.python.
C
onstants import Constants as con
from resources.libraries.python.topology import NodeType
__all__ = ["SetupFramework"]
from resources.libraries.python.topology import NodeType
__all__ = ["SetupFramework"]
@@
-56,7
+56,7
@@
def pack_framework_dir():
proc = Popen(
split("tar --sparse --exclude-vcs --exclude=output*.xml "
proc = Popen(
split("tar --sparse --exclude-vcs --exclude=output*.xml "
- "--exclude=./tmp -
-exclude=*.deb --exclude=*.rpm -
zcf {0} ."
+ "--exclude=./tmp -zcf {0} ."
.format(file_name)), stdout=PIPE, stderr=PIPE)
(stdout, stderr) = proc.communicate()
.format(file_name)), stdout=PIPE, stderr=PIPE)
(stdout, stderr) = proc.communicate()
@@
-84,6
+84,7
@@
def copy_tarball_to_node(tarball, node):
ssh.connect(node)
ssh.scp(tarball, "/tmp/")
ssh.connect(node)
ssh.scp(tarball, "/tmp/")
+ logger.console('Copying tarball to {0} done'.format(node['host']))
def extract_tarball_at_node(tarball, node):
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']))
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):
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']))
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):
def setup_node(args):