217 lines
9.4 KiB
Diff
217 lines
9.4 KiB
Diff
|
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/admin.py.orig 2019-05-31 10:40:01.592373104 -0400
|
||
|
|
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/admin.py 2019-05-31 10:41:18.182373104 -0400
|
||
|
|
@@ -34,18 +34,18 @@
|
||
|
|
self.show_status = show_status
|
||
|
|
|
||
|
|
def grace(self, ipaddr):
|
||
|
|
- async = self.asyncCall("grace", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("grace", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.admin_done)
|
||
|
|
|
||
|
|
def reload(self):
|
||
|
|
- async = self.asyncCall("reload")
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("reload")
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.admin_done)
|
||
|
|
|
||
|
|
def shutdown(self):
|
||
|
|
- async = self.asyncCall("shutdown")
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("shutdown")
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.admin_done)
|
||
|
|
|
||
|
|
# catch the reply and forward it to the UI
|
||
|
|
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/client_mgr.py.orig 2019-05-31 10:40:09.007373104 -0400
|
||
|
|
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/client_mgr.py 2019-05-31 10:41:41.781373104 -0400
|
||
|
|
@@ -49,18 +49,18 @@
|
||
|
|
self.show_status = show_status
|
||
|
|
|
||
|
|
def AddClient(self, ipaddr):
|
||
|
|
- async = self.asyncCall("AddClient", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("AddClient", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.clientmgr_done)
|
||
|
|
|
||
|
|
def RemoveClient(self, ipaddr):
|
||
|
|
- async = self.asyncCall("RemoveClient", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("RemoveClient", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.clientmgr_done)
|
||
|
|
|
||
|
|
def ShowClients(self):
|
||
|
|
- async = self.asyncCall("ShowClients")
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("ShowClients")
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.clientshow_done)
|
||
|
|
|
||
|
|
# catch the reply and forward it to the UI
|
||
|
|
@@ -114,23 +114,23 @@
|
||
|
|
self.status_handler = status_handler
|
||
|
|
|
||
|
|
def GetNFSv3IO(self, ipaddr):
|
||
|
|
- async = self.asyncCall("GetNFSv3IO", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv3IO", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv40IO(self, ipaddr):
|
||
|
|
- async = self.asyncCall("GetNFSv40IO", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv40IO", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv41IO(self, ipaddr):
|
||
|
|
- async = self.asyncCall("GetNFSv41IO", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv41IO", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv41Layouts(self, ipaddr):
|
||
|
|
- async = self.asyncCall("GetNFSv41Layouts", ipaddr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv41Layouts", ipaddr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.layout_done)
|
||
|
|
|
||
|
|
def io_done(self, call):
|
||
|
|
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/export_mgr.py.orig 2019-05-31 10:40:14.094373104 -0400
|
||
|
|
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/export_mgr.py 2019-05-31 10:42:06.230373104 -0400
|
||
|
|
@@ -54,28 +54,28 @@
|
||
|
|
self.show_status = show_status
|
||
|
|
|
||
|
|
def AddExport(self, conf_path, exp_expr):
|
||
|
|
- async = self.asyncCall("AddExport", conf_path, exp_expr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("AddExport", conf_path, exp_expr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.exportadd_done)
|
||
|
|
|
||
|
|
def UpdateExport(self, conf_path, exp_expr):
|
||
|
|
- async = self.asyncCall("UpdateExport", conf_path, exp_expr)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("UpdateExport", conf_path, exp_expr)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.exportadd_done)
|
||
|
|
|
||
|
|
def RemoveExport(self, exp_id):
|
||
|
|
- async = self.asyncCall("RemoveExport", int(exp_id))
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("RemoveExport", int(exp_id))
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.exportrm_done)
|
||
|
|
|
||
|
|
def DisplayExport(self, exp_id):
|
||
|
|
- async = self.asyncCall("DisplayExport", int(exp_id))
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("DisplayExport", int(exp_id))
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.exportdisplay_done)
|
||
|
|
|
||
|
|
def ShowExports(self):
|
||
|
|
- async = self.asyncCall("ShowExports")
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("ShowExports")
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.exportshow_done)
|
||
|
|
|
||
|
|
def exportadd_done(self, call):
|
||
|
|
@@ -148,23 +148,23 @@
|
||
|
|
self.stats_handler = stats_handler
|
||
|
|
|
||
|
|
def GetNFSv3IO(self, exportid):
|
||
|
|
- async = self.asyncCall("GetNFSv3IO", exportid)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv3IO", exportid)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv40IO(self, exportid):
|
||
|
|
- async = self.asyncCall("GetNFSv40IO", exportid)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv40IO", exportid)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv41IO(self, exportid):
|
||
|
|
- async = self.asyncCall("GetNFSv41IO", exportid)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv41IO", exportid)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.io_done)
|
||
|
|
|
||
|
|
def GetNFSv41Layouts(self, exportid):
|
||
|
|
- async = self.asyncCall("GetNFSv41Layouts", exportid)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetNFSv41Layouts", exportid)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.layout_done)
|
||
|
|
|
||
|
|
def io_done(self, call):
|
||
|
|
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/log_mgr.py.orig 2019-05-31 10:40:19.751373104 -0400
|
||
|
|
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/log_mgr.py 2019-05-31 10:42:16.978373104 -0400
|
||
|
|
@@ -42,8 +42,8 @@
|
||
|
|
self.show_status = show_status
|
||
|
|
|
||
|
|
def GetAll(self):
|
||
|
|
- async = self.asyncCall("GetAll", LOGGER_PROPS)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("GetAll", LOGGER_PROPS)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.GetAll_done)
|
||
|
|
|
||
|
|
def GetAll_done(self, call):
|
||
|
|
@@ -65,8 +65,8 @@
|
||
|
|
self.show_components.emit(prop_dict)
|
||
|
|
|
||
|
|
def Get(self, property):
|
||
|
|
- async = self.asyncCall("Get", LOGGER_PROPS, property)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ _async = self.asyncCall("Get", LOGGER_PROPS, property)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.Get_done)
|
||
|
|
|
||
|
|
def Get_done(self, call):
|
||
|
|
@@ -81,10 +81,10 @@
|
||
|
|
def Set(self, property, setval):
|
||
|
|
qval = QtDBus.QDBusVariant()
|
||
|
|
qval.setVariant(str(str(setval)))
|
||
|
|
- async = self.asyncCall("Set", LOGGER_PROPS,
|
||
|
|
+ _async = self.asyncCall("Set", LOGGER_PROPS,
|
||
|
|
property,
|
||
|
|
qval)
|
||
|
|
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||
|
|
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||
|
|
status.finished.connect(self.Set_done)
|
||
|
|
|
||
|
|
def Set_done(self, call):
|
||
|
|
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py.orig 2019-05-31 10:47:50.611373104 -0400
|
||
|
|
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py 2019-05-31 10:49:51.431373104 -0400
|
||
|
|
@@ -363,13 +363,13 @@
|
||
|
|
ts = (time[0],
|
||
|
|
time[1])
|
||
|
|
|
||
|
|
- fss = []
|
||
|
|
+ fss = []
|
||
|
|
for fs in fs_array:
|
||
|
|
filesys1 = FileSys(Path = str(fs[0]),
|
||
|
|
- MajorDevId = fs[1],
|
||
|
|
+ MajorDevId = fs[1],
|
||
|
|
MinorDevId = fs[2])
|
||
|
|
- fss.append(filesys1)
|
||
|
|
- return True, "Done", [ts, fss]
|
||
|
|
+ fss.append(filesys1)
|
||
|
|
+ return True, "Done", [ts, fss]
|
||
|
|
|
||
|
|
|
||
|
|
LOGGER_PROPS = 'org.ganesha.nfsd.log.component'
|