Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add OVS logger
[functest.git]
/
testcases
/
features
/
sfc
/
sfc_colorado1.py
diff --git
a/testcases/features/sfc/sfc_colorado1.py
b/testcases/features/sfc/sfc_colorado1.py
index
ef3a489
..
ed35cb3
100755
(executable)
--- a/
testcases/features/sfc/sfc_colorado1.py
+++ b/
testcases/features/sfc/sfc_colorado1.py
@@
-20,6
+20,7
@@
args = parser.parse_args()
""" logging configuration """
logger = ft_logger.Logger("ODL_SFC").getLogger()
""" logging configuration """
logger = ft_logger.Logger("ODL_SFC").getLogger()
+FUNCTEST_RESULTS_DIR = '/home/opnfv/functest/results/'
FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
HOME = os.environ['HOME'] + "/"
FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
HOME = os.environ['HOME'] + "/"
@@
-215,7
+216,7
@@
def main():
# STARTING SECOND VM (server) ###
# boot INTANCE
# STARTING SECOND VM (server) ###
# boot INTANCE
- logger.info("Creating instance '%s'..." % INSTANCE_NAME)
+ logger.info("Creating instance '%s'..." % INSTANCE_NAME
_2
)
logger.debug(
"Configuration:\n name=%s \n flavor=%s \n image=%s \n "
"network=%s \n" % (INSTANCE_NAME_2, FLAVOR, image_id, network_id))
logger.debug(
"Configuration:\n name=%s \n flavor=%s \n image=%s \n "
"network=%s \n" % (INSTANCE_NAME_2, FLAVOR, image_id, network_id))
@@
-500,10
+501,14
@@
def main():
" :) \n" + '\033[0m')
break
else:
" :) \n" + '\033[0m')
break
else:
- logger.
debug
("Iterating again!")
+ logger.
info
("Iterating again!")
delete = ("bash delete.sh")
delete = ("bash delete.sh")
- subprocess.call(delete, shell=True, stderr=subprocess.PIPE)
- time.sleep(10)
+ try:
+ subprocess.call(delete, shell=True, stderr=subprocess.PIPE)
+ time.sleep(10)
+ except Exception, e:
+ logger.error("Problem when executing the delete.sh")
+ logger.error("Problem %s" % e)
if args.report:
stop_time = time.time()
if args.report:
stop_time = time.time()