Hello Ayal Baron, Bala.FA, Saggi Mizrahi, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/13051
to review the following change.
Change subject: gluster: move exportToSupervdsm at module level
......................................................................
gluster: move exportToSupervdsm at module level
The current exportToSuperVdsm function scope is limited to cli.py.
It's moved to module level. This change enables exportToSuperVdsm
generically.
Change-Id: I5b8217899a637a10c7bc47a13e8afdddc1b0fefe
Signed-off-by: Timothy Asir <[email protected]>
---
M vdsm/gluster/__init__.py
M vdsm/gluster/cli.py
M vdsm/supervdsmServer.py
3 files changed, 26 insertions(+), 19 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/13051/1
diff --git a/vdsm/gluster/__init__.py b/vdsm/gluster/__init__.py
index 1ed02ac..c44d706 100644
--- a/vdsm/gluster/__init__.py
+++ b/vdsm/gluster/__init__.py
@@ -18,6 +18,9 @@
# Refer to the README and COPYING files for full details of the license
#
+
+from functools import wraps
+
GLUSTER_RPM_PACKAGES = (
('glusterfs', 'glusterfs'),
('glusterfs-fuse', 'glusterfs-fuse'),
@@ -38,3 +41,12 @@
('glusterfs-geo-replication', 'libglusterfs0'),
('glusterfs-rdma', 'libglusterfs0'),
('glusterfs-server', 'glusterfs-server'))
+
+
+def exportToSuperVdsm(func):
+ @wraps(func)
+ def wrapper(*args, **kwargs):
+ return func(*args, **kwargs)
+
+ wrapper.superVdsm = True
+ return wrapper
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index 13a5694..f04f881 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -25,6 +25,7 @@
from vdsm import netinfo
import exception as ge
from hostname import getHostNameFqdn, HostNameException
+from . import exportToSuperVdsm
_glusterCommandPath = utils.CommandPath("gluster",
"/usr/sbin/gluster",
@@ -43,15 +44,6 @@
def _getGlusterPeerCmd():
return [_glusterCommandPath.cmd, "--mode=script", "peer"]
-
-
-def exportToSuperVdsm(func):
- @wraps(func)
- def wrapper(*args, **kwargs):
- return func(*args, **kwargs)
-
- wrapper.superVdsm = True
- return wrapper
class BrickStatus:
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index d905201..9c0482e 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -342,17 +342,20 @@
def main():
- def bind(func):
- def wrapper(_SuperVdsm, *args, **kwargs):
- return func(*args, **kwargs)
- return wrapper
+ def bindToSuperVdsm(module):
+ def bind(func):
+ def wrapper(_SuperVdsm, *args, **kwargs):
+ return func(*args, **kwargs)
+ return wrapper
- for name in dir(gcli):
- func = getattr(gcli, name)
- if getattr(func, 'superVdsm', False):
- setattr(_SuperVdsm,
- 'gluster%s%s' % (name[0].upper(), name[1:]),
- logDecorator(bind(func)))
+ for name in dir(module):
+ func = getattr(module, name)
+ if getattr(func, 'superVdsm', False):
+ setattr(_SuperVdsm,
+ 'gluster%s%s' % (name[0].upper(), name[1:]),
+ logDecorator(bind(func)))
+
+ bindToSuperVdsm(gcli)
try:
logging.config.fileConfig(LOG_CONF_PATH)
--
To view, visit http://gerrit.ovirt.org/13051
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b8217899a637a10c7bc47a13e8afdddc1b0fefe
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Timothy Asir <[email protected]>
Gerrit-Reviewer: Ayal Baron <[email protected]>
Gerrit-Reviewer: Bala.FA <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Saggi Mizrahi <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
