Martin Polednik has uploaded a new change for review.
Change subject: osinfo: use pep8 function names
......................................................................
osinfo: use pep8 function names
Change-Id: I11e49e94e7bfbac08ba11da0ffa773925cca3ef0
Signed-off-by: Martin Polednik <mpoled...@redhat.com>
---
M lib/vdsm/osinfo.py
M vdsm/caps.py
2 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/54543/1
diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py
index 0c3765a..aef4f54 100644
--- a/lib/vdsm/osinfo.py
+++ b/lib/vdsm/osinfo.py
@@ -65,7 +65,7 @@
ENABLED = 1
-def getKdumpStatus():
+def kdump_status():
try:
# check if kdump service is running
with open('/sys/kernel/kexec_crash_loaded', 'r') as f:
@@ -89,7 +89,7 @@
@utils.memoized
-def _getos():
+def _release():
if os.path.exists('/etc/rhev-hypervisor-release'):
return OSName.RHEVH
elif glob.glob('/etc/ovirt-node-*-release'):
@@ -119,16 +119,16 @@
@utils.memoized
-def osversion():
- version = release = ''
+def version():
+ version = release_name = ''
- osname = getos()
+ osname = _release()
try:
if osname == OSName.RHEVH or osname == OSName.OVIRT:
- version, release = _parse_node_version('/etc/default/version')
+ version, release_name = _parse_node_version('/etc/default/version')
elif osname == OSName.DEBIAN:
version = linecache.getline('/etc/debian_version', 1).strip("\n")
- release = "" # Debian just has a version entry
+ release_name = "" # Debian just has a version entry
else:
if osname == OSName.POWERKVM:
release_path = '/etc/ibm_powerkvm-release'
@@ -138,21 +138,21 @@
ts = rpm.TransactionSet()
for er in ts.dbMatch('basenames', release_path):
version = er['version']
- release = er['release']
+ release_name = er['release']
except:
logging.error('failed to find version/release', exc_info=True)
- return dict(release=release, version=version, name=osname)
+ return dict(release=release_name, version=version, name=osname)
-def getSELinux():
+def selinux_status():
selinux = dict()
selinux['mode'] = str(utils.get_selinux_enforce_mode())
return selinux
-def getKeyPackages():
+def package_versions():
def kernelDict():
try:
ret = os.uname()
@@ -171,8 +171,8 @@
pkgs = {'kernel': kernelDict()}
- if getos() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL,
- OSName.POWERKVM):
+ if _release() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL,
+ OSName.POWERKVM):
KEY_PACKAGES = {
'glusterfs-cli': ('glusterfs-cli',),
'librbd1': ('librbd1',),
@@ -206,7 +206,7 @@
except:
logging.error('', exc_info=True)
- elif getos() == OSName.DEBIAN and python_apt:
+ elif _release() == OSName.DEBIAN and python_apt:
KEY_PACKAGES = {
'glusterfs-cli': 'glusterfs-cli',
'librbd1': 'librbd1',
diff --git a/vdsm/caps.py b/vdsm/caps.py
index fbb9508..f877680 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -153,9 +153,9 @@
except:
logging.debug('not reporting hooks', exc_info=True)
- caps['operatingSystem'] = osinfo.osversion()
+ caps['operatingSystem'] = osinfo.version()
caps['uuid'] = host.uuid()
- caps['packages2'] = osinfo.getKeyPackages()
+ caps['packages2'] = osinfo.package_versions()
caps['emulatedMachines'] = machinetype.emulated_machines(
cpuarch.effective())
try:
@@ -191,13 +191,13 @@
caps['numaNodeDistance'] = dict(numa.distances())
caps['autoNumaBalancing'] = numa.autonuma_status()
- caps['selinux'] = osinfo.getSELinux()
+ caps['selinux'] = osinfo.selinux_status()
liveSnapSupported = _getLiveSnapshotSupport(cpuarch.effective())
if liveSnapSupported is not None:
caps['liveSnapshot'] = str(liveSnapSupported).lower()
caps['liveMerge'] = str(getLiveMergeSupport()).lower()
- caps['kdumpStatus'] = osinfo.getKdumpStatus()
+ caps['kdumpStatus'] = osinfo.kdump_status()
caps['hostdevPassthrough'] = str(hostdev.is_supported()).lower()
caps['additionalFeatures'] = []
--
To view, visit https://gerrit.ovirt.org/54543
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11e49e94e7bfbac08ba11da0ffa773925cca3ef0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoled...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
