Change in vdsm[master]: virt: adding virt mkimage api module to supervdsm

fromani at redhat.com fromani at redhat.com
Wed Feb 24 16:10:29 UTC 2016


Francesco Romani has uploaded a new change for review.

Change subject: virt: adding virt mkimage api module to supervdsm
......................................................................

virt: adding virt mkimage api module to supervdsm

Change-Id: Ib64d63b223cca53e843f7e81d455308241443747
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/supervdsmServer
A vdsm/supervdsm_api/mkimage.py
2 files changed, 28 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/54005/1

diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index d4760c2..6dc0773 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -80,7 +80,6 @@
     VDSM_USER, QEMU_PROCESS_USER, QEMU_PROCESS_GROUP, GLUSTER_MGMT_ENABLED
 from storage.devicemapper import _removeMapping, _getPathsStatus
 from vdsm.config import config
-import mkimage
 import supervdsm_api
 
 _UDEV_RULE_FILE_DIR = "/etc/udev/rules.d/"
@@ -395,18 +394,6 @@
                                 (k, v))
             with open('/sys/kernel/mm/ksm/%s' % k, 'w') as f:
                 f.write(str(v))
-
-    @logDecorator
-    def mkFloppyFs(self, vmId, files, volId):
-        return mkimage.mkFloppyFs(vmId, files, volId)
-
-    @logDecorator
-    def mkIsoFs(self, vmId, files, volId):
-        return mkimage.mkIsoFs(vmId, files, volId)
-
-    @logDecorator
-    def removeFs(self, path):
-        return mkimage.removeFs(path)
 
     @logDecorator
     def fuser(self, *args, **kwargs):
diff --git a/vdsm/supervdsm_api/mkimage.py b/vdsm/supervdsm_api/mkimage.py
new file mode 100644
index 0000000..76ef898
--- /dev/null
+++ b/vdsm/supervdsm_api/mkimage.py
@@ -0,0 +1,28 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+from __future__ import absolute_import
+
+from . import expose
+
+from mkimage import mkFloppyFs, mkIsoFs, removeFs
+
+
+expose(mkFloppyFs)
+expose(mkIsoFs)
+expose(removeFs)


-- 
To view, visit https://gerrit.ovirt.org/54005
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib64d63b223cca53e843f7e81d455308241443747
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list