Change in vdsm[master]: packaging: split vdsm-tests.deb out from vdsm.deb
by zhshzhou＠linux.vnet.ibm.com
Zhou Zheng Sheng has uploaded a new change for review.
Change subject: packaging: split vdsm-tests.deb out from vdsm.deb
......................................................................
packaging: split vdsm-tests.deb out from vdsm.deb
Create debian/vdsm.install to describe files in the main .deb package,
and debian/vdsm-tests.install to describe files in the vdsm-tests.deb.
Change-Id: I87b278201aa96a73b4fb3b28233aeb549ee7b310
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
M debian/control
A debian/vdsm-tests.docs
A debian/vdsm-tests.install
A debian/vdsm.dirs
R debian/vdsm.docs
A debian/vdsm.install
R debian/vdsm.postinst
R debian/vdsm.postrm
R debian/vdsm.preinst
R debian/vdsm.prerm
10 files changed, 298 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/18719/1
diff --git a/debian/control b/debian/control
index 0c347b6..10e4f36 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,16 @@
Package: vdsm
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debianutils, sudo (>= 1.7.3), logrotate, rsyslog, xz-utils, ntp, iproute, python-netaddr, python-pyinotify, python-ethtool (>= 0.8), python-rpm, nfs-client, nfs-server, python-m2crypto, libguestfs-tools, python-dmidecode, dmidecode, libvirt-bin (>= 1.1.1), libvirt0 (>= 1.1.1), libvirt-sanlock, python-libvirt (>= 1.1.1), python-pthreading (>= 0.1.2), fence-agents, python (>= 2.7.4), qemu-kvm (>= 1.4.0), qemu-utils (>= 1.4.0), python-ethtool (>= 0.8), initscripts (>= 2.88), ifupdown, sysvinit-utils, sysv-rc, open-iscsi (>= 2.0.873), multipath-tools (>= 0.4.9), e2fsprogs (>= 1.41.14), linux-image-generic (>= 3.6), sanlock (>= 2.4), libsanlock-client1 (>= 2.4), libsanlock-dev (>= 2.4), sanlock-python (>= 2.4), policycoreutils (>=2.1.13), python-sepolgen, sed (>= 4.2.1), ed, selinux-policy-default (>= 2.20110726), lvm2 (>= 2.02.95), psmisc (>= 22.6), bridge-utils, sosreport, tree, dosfstools, genisoimage, python-se!
linux, python-parted, sasl2-bin, hostname, glusterfs-common (>= 3.4.0), glusterfs-client, glusterfs-server, python-magic, python-nose, gnutls-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debianutils, sudo (>= 1.7.3), logrotate, rsyslog, xz-utils, ntp, iproute, python-netaddr, python-pyinotify, python-ethtool (>= 0.8), python-rpm, nfs-client, nfs-server, python-m2crypto, libguestfs-tools, python-dmidecode, dmidecode, libvirt-bin (>= 1.1.1), libvirt0 (>= 1.1.1), libvirt-sanlock, python-libvirt (>= 1.1.1), python-pthreading (>= 0.1.2), fence-agents, python (>= 2.7.4), qemu-kvm (>= 1.4.0), qemu-utils (>= 1.4.0), python-ethtool (>= 0.8), initscripts (>= 2.88), ifupdown, sysvinit-utils, sysv-rc, open-iscsi (>= 2.0.873), multipath-tools (>= 0.4.9), e2fsprogs (>= 1.41.14), linux-image-generic (>= 3.6), sanlock (>= 2.4), libsanlock-client1 (>= 2.4), libsanlock-dev (>= 2.4), sanlock-python (>= 2.4), policycoreutils (>=2.1.13), python-sepolgen, sed (>= 4.2.1), ed, selinux-policy-default (>= 2.20110726), lvm2 (>= 2.02.95), psmisc (>= 22.6), bridge-utils, sosreport, tree, dosfstools, genisoimage, python-se!
linux, python-parted, sasl2-bin, hostname, glusterfs-common (>= 3.4.0), glusterfs-client, glusterfs-server, python-magic, gnutls-bin
Conflicts: apparmor
Description: VDSM: Virtual Desktop Server Manager
The VDSM service is required by a Virtualization Manager to manage the
Linux hosts. VDSM manages and monitors the host's storage, memory and
networks as well as virtual machine creation, other host administration
tasks, statistics gathering, and log collection.
+
+Package: vdsm-tests
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}), python-nose
+Description: Unit and functional tests for vdsm
+ A test suite for verifying the functionality of a running vdsm instance
diff --git a/debian/vdsm-tests.docs b/debian/vdsm-tests.docs
new file mode 100644
index 0000000..8a81e98
--- /dev/null
+++ b/debian/vdsm-tests.docs
@@ -0,0 +1 @@
+tests/README
diff --git a/debian/vdsm-tests.install b/debian/vdsm-tests.install
new file mode 100644
index 0000000..5279d32
--- /dev/null
+++ b/debian/vdsm-tests.install
@@ -0,0 +1,13 @@
+usr/share/vdsm/tests
+usr/share/vdsm/tests/*.py
+usr/share/vdsm/tests/cpu_info.out
+usr/share/vdsm/tests/caps_libvirt_intel_E5649.out
+usr/share/vdsm/tests/caps_libvirt_amd_6274.out
+usr/share/vdsm/tests/caps_libvirt_intel_E31220.out
+usr/share/vdsm/tests/glob_1c60971a-8647-44ac-ae33-6520887f8843.out
+usr/share/vdsm/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
+usr/share/vdsm/tests/netmaskconversions
+usr/share/vdsm/tests/run_tests.sh
+usr/share/vdsm/tests/tc_filter_show.out
+usr/share/vdsm/tests/functional/*.py
+usr/share/vdsm/tests/functional/*.policy
diff --git a/debian/vdsm.dirs b/debian/vdsm.dirs
new file mode 100644
index 0000000..f438a18
--- /dev/null
+++ b/debian/vdsm.dirs
@@ -0,0 +1,65 @@
+data
+data/updates
+etc/ovirt-commandline.d
+etc/pki/vdsm
+etc/pki/vdsm/certs
+etc/pki/vdsm/keys
+etc/vdsm
+etc/vdsm-reg
+etc/vdsm/mom.d
+rhev
+rhev/data-center
+rhev/data-center/hsm-tasks
+rhev/data-center/mnt
+usr/libexec/vdsm/hooks/after_device_create
+usr/libexec/vdsm/hooks/after_device_destroy
+usr/libexec/vdsm/hooks/after_device_migrate_destination
+usr/libexec/vdsm/hooks/after_device_migrate_source
+usr/libexec/vdsm/hooks/after_disk_hotplug
+usr/libexec/vdsm/hooks/after_disk_hotunplug
+usr/libexec/vdsm/hooks/after_nic_hotplug
+usr/libexec/vdsm/hooks/after_nic_hotplug_fail
+usr/libexec/vdsm/hooks/after_nic_hotunplug
+usr/libexec/vdsm/hooks/after_nic_hotunplug_fail
+usr/libexec/vdsm/hooks/after_update_device
+usr/libexec/vdsm/hooks/after_update_device_fail
+usr/libexec/vdsm/hooks/after_vdsm_stop
+usr/libexec/vdsm/hooks/after_vm_cont
+usr/libexec/vdsm/hooks/after_vm_dehibernate
+usr/libexec/vdsm/hooks/after_vm_destroy
+usr/libexec/vdsm/hooks/after_vm_hibernate
+usr/libexec/vdsm/hooks/after_vm_migrate_destination
+usr/libexec/vdsm/hooks/after_vm_migrate_source
+usr/libexec/vdsm/hooks/after_vm_pause
+usr/libexec/vdsm/hooks/after_vm_set_ticket
+usr/libexec/vdsm/hooks/after_vm_start
+usr/libexec/vdsm/hooks/before_device_create
+usr/libexec/vdsm/hooks/before_device_destroy
+usr/libexec/vdsm/hooks/before_device_migrate_destination
+usr/libexec/vdsm/hooks/before_device_migrate_source
+usr/libexec/vdsm/hooks/before_disk_hotplug
+usr/libexec/vdsm/hooks/before_disk_hotunplug
+usr/libexec/vdsm/hooks/before_nic_hotplug
+usr/libexec/vdsm/hooks/before_nic_hotunplug
+usr/libexec/vdsm/hooks/before_update_device
+usr/libexec/vdsm/hooks/before_vdsm_start
+usr/libexec/vdsm/hooks/before_vm_cont
+usr/libexec/vdsm/hooks/before_vm_dehibernate
+usr/libexec/vdsm/hooks/before_vm_destroy
+usr/libexec/vdsm/hooks/before_vm_hibernate
+usr/libexec/vdsm/hooks/before_vm_migrate_destination
+usr/libexec/vdsm/hooks/before_vm_migrate_source
+usr/libexec/vdsm/hooks/before_vm_pause
+usr/libexec/vdsm/hooks/before_vm_set_ticket
+usr/libexec/vdsm/hooks/before_vm_start
+var/lib/libvirt/qemu/channels
+var/lib/vdsm
+var/lib/vdsm/netconfback
+var/log/vdsm
+var/log/vdsm-reg
+var/log/vdsm/backup
+var/run/vdsm
+var/run/vdsm/payload
+var/run/vdsm/pools
+var/run/vdsm/sourceRoutes
+var/run/vdsm/trackedInterfaces
diff --git a/debian/docs b/debian/vdsm.docs
similarity index 100%
rename from debian/docs
rename to debian/vdsm.docs
diff --git a/debian/vdsm.install b/debian/vdsm.install
new file mode 100644
index 0000000..29fba0c
--- /dev/null
+++ b/debian/vdsm.install
@@ -0,0 +1,212 @@
+./etc/bash_completion.d/vdsClient
+./etc/cron.d/vdsm-libvirt-logrotate
+./etc/cron.hourly/vdsm-logrotate
+./etc/cron.hourly/vdsm-reg-logrotate
+./etc/dhcp/dhclient.d/sourceRoute.sh
+./etc/logrotate.d/vdsm
+./etc/logrotate.d/vdsm-reg
+./etc/ovirt-commandline.d/vdsm-reg
+./etc/ovirt-config-boot.d/vdsm-config
+./etc/pki/vdsm/keys/libvirt_password
+./etc/rwtab.d/vdsm
+./etc/sudoers.d/50_vdsm
+./etc/sudoers.d/50_vdsm_hook_openstacknet
+./etc/sudoers.d/50_vdsm_hook_vhostmd
+./etc/sysctl.d/vdsm
+./etc/vdsm-reg/logger.conf
+./etc/vdsm-reg/vdsm-reg.conf
+./etc/vdsm/logger.conf
+./etc/vdsm/mom.conf
+./etc/vdsm/mom.d/00-python.policy
+./etc/vdsm/mom.d/01-parameters.policy
+./etc/vdsm/mom.d/02-balloon.policy
+./etc/vdsm/mom.d/03-ksm.policy
+./etc/vdsm/svdsm.logger.conf
+./usr/bin/vdsClient
+./usr/bin/vdsm-tool
+./usr/lib/python2.7/dist-packages/cpopen/__init__.py
+./usr/lib/python2.7/dist-packages/cpopen/cpopen.so
+./usr/lib/python2.7/dist-packages/ovirt_config_setup/engine.py
+./usr/lib/python2.7/dist-packages/sos/plugins/vdsm.py
+./usr/lib/python2.7/dist-packages/vdsm/SecureXMLRPCServer.py
+./usr/lib/python2.7/dist-packages/vdsm/__init__.py
+./usr/lib/python2.7/dist-packages/vdsm/config.py
+./usr/lib/python2.7/dist-packages/vdsm/constants.py
+./usr/lib/python2.7/dist-packages/vdsm/define.py
+./usr/lib/python2.7/dist-packages/vdsm/exception.py
+./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py
+./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py
+./usr/lib/python2.7/dist-packages/vdsm/netinfo.py
+./usr/lib/python2.7/dist-packages/vdsm/qemuImg.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/dummybr.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/libvirt_configure.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/load_needed_modules.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/nwfilter.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/passwd.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/sanlock.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/seboolsetup.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/service.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/validate_ovirt_certs.py
+./usr/lib/python2.7/dist-packages/vdsm/tool/vdsm-id.py
+./usr/lib/python2.7/dist-packages/vdsm/utils.py
+./usr/lib/python2.7/dist-packages/vdsm/vdscli.py
+./usr/lib/python2.7/dist-packages/vdsmapi.py
+./usr/lib/python2.7/dist-packages/yajsonrpc/__init__.py
+./usr/lib/python2.7/dist-packages/yajsonrpc/asyncoreReactor.py
+./usr/lib/python2.7/dist-packages/yajsonrpc/client.py
+./usr/lib/python2.7/dist-packages/yajsonrpc/protonReactor.py
+./usr/libexec/vdsm/curl-img-wrap
+./usr/libexec/vdsm/hooks/after_device_create/50_openstacknet
+./usr/libexec/vdsm/hooks/after_device_create/openstacknet_consts.py
+./usr/libexec/vdsm/hooks/after_device_migrate_destination/50_openstacknet
+./usr/libexec/vdsm/hooks/after_device_migrate_destination/openstacknet_consts.py
+./usr/libexec/vdsm/hooks/after_nic_hotplug/50_openstacknet
+./usr/libexec/vdsm/hooks/after_nic_hotplug/openstacknet_consts.py
+./usr/libexec/vdsm/hooks/after_vm_destroy/50_vhostmd
+./usr/libexec/vdsm/hooks/before_device_create/50_openstacknet
+./usr/libexec/vdsm/hooks/before_device_create/openstacknet_consts.py
+./usr/libexec/vdsm/hooks/before_nic_hotplug/50_openstacknet
+./usr/libexec/vdsm/hooks/before_nic_hotplug/openstacknet_consts.py
+./usr/libexec/vdsm/hooks/before_vm_dehibernate/50_vhostmd
+./usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_vhostmd
+./usr/libexec/vdsm/hooks/before_vm_start/10_faqemu
+./usr/libexec/vdsm/hooks/before_vm_start/50_qemucmdline
+./usr/libexec/vdsm/hooks/before_vm_start/50_vhostmd
+./usr/libexec/vdsm/libvirt_configure.sh
+./usr/libexec/vdsm/ovirt_functions.sh
+./usr/libexec/vdsm/persist-vdsm-hooks
+./usr/libexec/vdsm/safelease
+./usr/libexec/vdsm/spmprotect.sh
+./usr/libexec/vdsm/spmstop.sh
+./usr/libexec/vdsm/unpersist-vdsm-hook
+./usr/libexec/vdsm/vdsm-gencerts.sh
+./usr/libexec/vdsm/vdsmd_init_common.sh
+./usr/share/man/man1/vdsClient.1
+./usr/share/man/man8/vdsm-reg.8
+./usr/share/man/man8/vdsmd.8
+./usr/share/vdsm-bootstrap/deployUtil.py
+./usr/share/vdsm-bootstrap/interface-2/deployUtil.py
+./usr/share/vdsm-bootstrap/interface-2/miniyum.py
+./usr/share/vdsm-bootstrap/interface-2/setup
+./usr/share/vdsm-bootstrap/interface-2/vds_bootstrap.py
+./usr/share/vdsm-bootstrap/interface-2/vds_bootstrap_complete.py
+./usr/share/vdsm-bootstrap/vds_bootstrap.py
+./usr/share/vdsm-bootstrap/vds_bootstrap_complete.py
+./usr/share/vdsm-reg/config.py
+./usr/share/vdsm-reg/createDaemon.py
+./usr/share/vdsm-reg/deployUtil.py
+./usr/share/vdsm-reg/register-to-engine.py
+./usr/share/vdsm-reg/save-config
+./usr/share/vdsm-reg/vdsm-complete
+./usr/share/vdsm-reg/vdsm-gen-cert
+./usr/share/vdsm-reg/vdsm-reg-setup
+./usr/share/vdsm-reg/vdsm-upgrade
+./usr/share/vdsm/API.py
+./usr/share/vdsm/BindingJsonRpc.py
+./usr/share/vdsm/BindingXMLRPC.py
+./usr/share/vdsm/Bridge.py
+./usr/share/vdsm/addNetwork
+./usr/share/vdsm/alignmentScan.py
+./usr/share/vdsm/blkid.py
+./usr/share/vdsm/caps.py
+./usr/share/vdsm/clientIF.py
+./usr/share/vdsm/configNetwork.py
+./usr/share/vdsm/daemonAdapter
+./usr/share/vdsm/debugPluginClient.py
+./usr/share/vdsm/delNetwork
+./usr/share/vdsm/dmidecodeUtil.py
+./usr/share/vdsm/dsaversion.py
+./usr/share/vdsm/dumpStorageTable.py
+./usr/share/vdsm/get-conf-item
+./usr/share/vdsm/gluster/__init__.py
+./usr/share/vdsm/gluster/api.py
+./usr/share/vdsm/gluster/cli.py
+./usr/share/vdsm/gluster/exception.py
+./usr/share/vdsm/gluster/hooks.py
+./usr/share/vdsm/gluster/hostname.py
+./usr/share/vdsm/gluster/services.py
+./usr/share/vdsm/gluster/vdsmapi-gluster-schema.json
+./usr/share/vdsm/guestIF.py
+./usr/share/vdsm/hooking.py
+./usr/share/vdsm/hooks.py
+./usr/share/vdsm/kaxmlrpclib.py
+./usr/share/vdsm/ksm.py
+./usr/share/vdsm/logUtils.py
+./usr/share/vdsm/lsblk.py
+./usr/share/vdsm/md_utils.py
+./usr/share/vdsm/mk_sysprep_floppy
+./usr/share/vdsm/mkimage.py
+./usr/share/vdsm/momIF.py
+./usr/share/vdsm/netconf/__init__.py
+./usr/share/vdsm/netconf/ifcfg.py
+./usr/share/vdsm/netconf/iproute2.py
+./usr/share/vdsm/netconf/libvirtCfg.py
+./usr/share/vdsm/neterrors.py
+./usr/share/vdsm/netmodels.py
+./usr/share/vdsm/parted_utils.py
+./usr/share/vdsm/respawn
+./usr/share/vdsm/sampling.py
+./usr/share/vdsm/set-conf-item
+./usr/share/vdsm/sourceRoute.py
+./usr/share/vdsm/sourceRouteThread.py
+./usr/share/vdsm/storage/__init__.py
+./usr/share/vdsm/storage/blockSD.py
+./usr/share/vdsm/storage/blockVolume.py
+./usr/share/vdsm/storage/clusterlock.py
+./usr/share/vdsm/storage/curlImgWrap.py
+./usr/share/vdsm/storage/devicemapper.py
+./usr/share/vdsm/storage/dispatcher.py
+./usr/share/vdsm/storage/domainMonitor.py
+./usr/share/vdsm/storage/fileSD.py
+./usr/share/vdsm/storage/fileUtils.py
+./usr/share/vdsm/storage/fileVolume.py
+./usr/share/vdsm/storage/fuser.py
+./usr/share/vdsm/storage/glusterSD.py
+./usr/share/vdsm/storage/glusterVolume.py
+./usr/share/vdsm/storage/hba.py
+./usr/share/vdsm/storage/hsm.py
+./usr/share/vdsm/storage/image.py
+./usr/share/vdsm/storage/imageRepository/__init__.py
+./usr/share/vdsm/storage/imageRepository/formatConverter.py
+./usr/share/vdsm/storage/imageSharing.py
+./usr/share/vdsm/storage/iscsi.py
+./usr/share/vdsm/storage/iscsiadm.py
+./usr/share/vdsm/storage/localFsSD.py
+./usr/share/vdsm/storage/lvm.py
+./usr/share/vdsm/storage/misc.py
+./usr/share/vdsm/storage/mount.py
+./usr/share/vdsm/storage/multipath.py
+./usr/share/vdsm/storage/nfsSD.py
+./usr/share/vdsm/storage/outOfProcess.py
+./usr/share/vdsm/storage/persistentDict.py
+./usr/share/vdsm/storage/remoteFileHandler.py
+./usr/share/vdsm/storage/resourceFactories.py
+./usr/share/vdsm/storage/resourceManager.py
+./usr/share/vdsm/storage/sd.py
+./usr/share/vdsm/storage/sdc.py
+./usr/share/vdsm/storage/securable.py
+./usr/share/vdsm/storage/sp.py
+./usr/share/vdsm/storage/storageConstants.py
+./usr/share/vdsm/storage/storageServer.py
+./usr/share/vdsm/storage/storage_exception.py
+./usr/share/vdsm/storage/storage_mailbox.py
+./usr/share/vdsm/storage/sync.py
+./usr/share/vdsm/storage/task.py
+./usr/share/vdsm/storage/taskManager.py
+./usr/share/vdsm/storage/threadLocal.py
+./usr/share/vdsm/storage/threadPool.py
+./usr/share/vdsm/storage/volume.py
+./usr/share/vdsm/supervdsm.py
+./usr/share/vdsm/supervdsmServer
+./usr/share/vdsm/tc.py
+./usr/share/vdsm/vdsClient.py
+./usr/share/vdsm/vdsClientGluster.py
+./usr/share/vdsm/vdsm
+./usr/share/vdsm/vdsm-restore-net-config
+./usr/share/vdsm/vdsm-store-net-config
+./usr/share/vdsm/vdsmDebugPlugin.py
+./usr/share/vdsm/vdsmapi-schema.json
+./usr/share/vdsm/vm.py
+./usr/share/vdsm/vmChannels.py
+./usr/share/vdsm/zombieReaper.py
diff --git a/debian/postinst b/debian/vdsm.postinst
similarity index 100%
rename from debian/postinst
rename to debian/vdsm.postinst
diff --git a/debian/postrm b/debian/vdsm.postrm
similarity index 100%
rename from debian/postrm
rename to debian/vdsm.postrm
diff --git a/debian/preinst b/debian/vdsm.preinst
similarity index 100%
rename from debian/preinst
rename to debian/vdsm.preinst
diff --git a/debian/prerm b/debian/vdsm.prerm
similarity index 100%
rename from debian/prerm
rename to debian/vdsm.prerm
--
To view, visit http://gerrit.ovirt.org/18719
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87b278201aa96a73b4fb3b28233aeb549ee7b310
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
10 years, 7 months
- 2
- 2
Change in vdsm[master]: clientIF: return doneCode in getDiskAlignment
by ykaplan＠redhat.com
Yeela Kaplan has uploaded a new change for review.
Change subject: clientIF: return doneCode in getDiskAlignment
......................................................................
clientIF: return doneCode in getDiskAlignment
Engine expects a dictionary instead of an integer(0)
Change-Id: I9effa0c05b711cd2f1983009f92819cb315ec9f0
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=998411
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com>
---
M vdsm/clientIF.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/18737/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index c2a25fc..38822fe 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -382,7 +382,7 @@
finally:
self.teardownVolumePath(drive)
- return {'status': 0, 'alignment': aligning}
+ return {'status': doneCode, 'alignment': aligning}
def createVm(self, vmParams):
with self.vmContainerLock:
--
To view, visit http://gerrit.ovirt.org/18737
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9effa0c05b711cd2f1983009f92819cb315ec9f0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
10 years, 7 months
- 4
- 4
Change in vdsm[master]: vdsm: Hardware information about POWER hosts
by ybronhei＠redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: vdsm: Hardware information about POWER hosts
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
....................................................
File vdsm/supervdsmServer
Line 101: KB = 2 ** 10
Line 102: TEST_BUFF_LEN = 4 * KB
Line 103:
Line 104:
Line 105: def getHardwareInfoStructurePPC64():
Here is not the location for specific implementation, as we don't put the dmidecodeUtil code and other api logic in this file. This file is dedicated only to declare supervdsm api and startup logic, please move it to external package.
I prefer adding it to dmidecodeUtil.py and change the name to hardwareInfoUtil or something in that direction
Line 106: infoStructure = {'systemProductName': 'unavailable',
Line 107: 'systemSerialNumber': 'unavailable',
Line 108: 'systemFamily': 'unavailable',
Line 109: 'systemVersion': 'unavailable',
--
To view, visit http://gerrit.ovirt.org/17417
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0ec8c92dbca5837aacd299555d34d97931d7a1f0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vitor de Lima <vitor.lima(a)eldorado.org.br>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
10 years, 8 months
- 1
- 0