Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow overriding default XtestingCI version
[releng.git]
/
modules
/
opnfv
/
deployment
/
manager.py
diff --git
a/modules/opnfv/deployment/manager.py
b/modules/opnfv/deployment/manager.py
index
694df77
..
2b5aedb
100644
(file)
--- a/
modules/opnfv/deployment/manager.py
+++ b/
modules/opnfv/deployment/manager.py
@@
-241,13
+241,13
@@
class Node(object):
Returns the ovs version installed
'''
if self.is_active():
Returns the ovs version installed
'''
if self.is_active():
- cmd = "ovs-vsctl --version|head -1| sed 's/^.*) //'"
- return self.run_cmd(cmd)
+ cmd = "ovs-vsctl --version
2>/dev/null
|head -1| sed 's/^.*) //'"
+ return self.run_cmd(cmd)
or None
return None
def get_system_info(self):
'''
return None
def get_system_info(self):
'''
- Returns
the ovs version installed
+ Returns
system information
'''
cmd = 'grep MemTotal /proc/meminfo'
memory = self.run_cmd(cmd).partition('MemTotal:')[-1].strip().encode()
'''
cmd = 'grep MemTotal /proc/meminfo'
memory = self.run_cmd(cmd).partition('MemTotal:')[-1].strip().encode()