Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow running Functest vs profiles defined by GSMA
[functest.git]
/
functest
/
utils
/
functest_utils.py
diff --git
a/functest/utils/functest_utils.py
b/functest/utils/functest_utils.py
index
b49337d
..
42c1edc
100644
(file)
--- a/
functest/utils/functest_utils.py
+++ b/
functest/utils/functest_utils.py
@@
-43,9
+43,9
@@
def execute_command(cmd, info=False, error_msg="",
ofd = open(output_file, "w")
for line in iter(popen.stdout.readline, b''):
if output_file:
ofd = open(output_file, "w")
for line in iter(popen.stdout.readline, b''):
if output_file:
- ofd.write(line)
+ ofd.write(line
.decode("utf-8")
)
else:
else:
- line = line.replace('\n', '')
+ line = line.
decode("utf-8").
replace('\n', '')
print(line)
sys.stdout.flush()
if output_file:
print(line)
sys.stdout.flush()
if output_file:
@@
-111,8
+111,10
@@
def get_openstack_version(cloud):
version = get_nova_version(cloud)
try:
assert version
version = get_nova_version(cloud)
try:
assert version
- if version > (2,
65
):
+ if version > (2,
72
):
osversion = "Master"
osversion = "Master"
+ elif version > (2, 65):
+ osversion = "Stein"
elif version > (2, 60):
osversion = "Rocky"
elif version > (2, 53):
elif version > (2, 60):
osversion = "Rocky"
elif version > (2, 53):