ShaoHe Feng has uploaded a new change for review.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
move betterPopen to storage for HSM service standalone
move betterPopen to the hsm python lib This is one of step to make HSM service standalone wiki-page: http://wiki.ovirt.org/wiki/HSM_service_stand_alone
Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Signed-off-by: ShaoHe Feng shaohef@linux.vnet.ibm.com --- M configure.ac M tests/betterPopenTests.py M tests/testrunner.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/storage/Makefile.am R vdsm/storage/betterPopen/.gitignore R vdsm/storage/betterPopen/Makefile.am R vdsm/storage/betterPopen/__init__.py R vdsm/storage/betterPopen/createprocess.c R vdsm/storage/betterPopen/setup.py M vdsm/storage/misc.py M vdsm/storage/remoteFileHandler.py 13 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/9356/1
diff --git a/configure.ac b/configure.ac index 2412a01..b6de932 100644 --- a/configure.ac +++ b/configure.ac @@ -218,9 +218,9 @@ vdsm_hooks/vmdisk/Makefile vdsm/Makefile vdsm_reg/Makefile - vdsm/betterPopen/Makefile vdsm/gluster/Makefile vdsm/sos/Makefile + vdsm/storage/betterPopen/Makefile vdsm/storage/Makefile vdsm/storage/imageRepository/Makefile vdsm/storage/protect/Makefile diff --git a/tests/betterPopenTests.py b/tests/betterPopenTests.py index 6347460..b48288a 100644 --- a/tests/betterPopenTests.py +++ b/tests/betterPopenTests.py @@ -28,7 +28,7 @@
if __name__ != "__main__": # This will not be available when we use this module as a subprocess - from vdsm.betterPopen import BetterPopen + from hsmd.betterPopen import BetterPopen
class TestBetterPopen(TestCaseBase): diff --git a/tests/testrunner.py b/tests/testrunner.py index 596ced1..73cd629 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -235,7 +235,7 @@ sys.modules['vdsm'] = mod = vdsm()
for name in ('config', 'constants', 'utils', 'define', 'netinfo', - 'SecureXMLRPCServer', 'libvirtconnection', 'betterPopen', + 'SecureXMLRPCServer', 'libvirtconnection', 'exception', 'vdscli', 'qemuImg'): sub = __import__(name, globals(), locals(), [], -1) setattr(mod, name, sub) diff --git a/vdsm.spec.in b/vdsm.spec.in index c5997e8..c1140ce 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -771,13 +771,13 @@ %{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py* %{python_sitearch}/%{vdsm_name}/utils.py* %{python_sitearch}/%{vdsm_name}/vdscli.py* -%{python_sitearch}/%{vdsm_name}/betterPopen/__init__.py* -%{python_sitearch}/%{vdsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{vdsm_name}/tool/__init__.py* %{python_sitearch}/%{vdsm_name}/tool/passwd.py* %{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* %{python_sitearch}/%{hsm_name}/__init__.py* +%{python_sitearch}/%{hsm_name}/betterPopen/__init__.py* +%{python_sitearch}/%{hsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{hsm_name}/config.py* %{python_sitearch}/%{hsm_name}/constants.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 7c79036..b127168 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license #
-SUBDIRS = sos storage betterPopen rest gluster +SUBDIRS = sos storage rest gluster
include $(top_srcdir)/build-aux/Makefile.subs
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 09028a5..188943f 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license #
-SUBDIRS = protect imageRepository +SUBDIRS = betterPopen protect imageRepository
include $(top_srcdir)/build-aux/Makefile.subs
diff --git a/vdsm/betterPopen/.gitignore b/vdsm/storage/betterPopen/.gitignore similarity index 100% rename from vdsm/betterPopen/.gitignore rename to vdsm/storage/betterPopen/.gitignore diff --git a/vdsm/betterPopen/Makefile.am b/vdsm/storage/betterPopen/Makefile.am similarity index 96% rename from vdsm/betterPopen/Makefile.am rename to vdsm/storage/betterPopen/Makefile.am index 9a14e86..b76c3db 100644 --- a/vdsm/betterPopen/Makefile.am +++ b/vdsm/storage/betterPopen/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license #
-betterpopendir = $(vdsmpylibdir)/betterPopen +betterpopendir = $(hsmpylibdir)/betterPopen
dist_betterpopen_PYTHON = \ __init__.py diff --git a/vdsm/betterPopen/__init__.py b/vdsm/storage/betterPopen/__init__.py similarity index 100% rename from vdsm/betterPopen/__init__.py rename to vdsm/storage/betterPopen/__init__.py diff --git a/vdsm/betterPopen/createprocess.c b/vdsm/storage/betterPopen/createprocess.c similarity index 100% rename from vdsm/betterPopen/createprocess.c rename to vdsm/storage/betterPopen/createprocess.c diff --git a/vdsm/betterPopen/setup.py b/vdsm/storage/betterPopen/setup.py similarity index 100% rename from vdsm/betterPopen/setup.py rename to vdsm/storage/betterPopen/setup.py diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 9de1e93..ea874df 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -58,7 +58,7 @@ sys.path.append("../") from hsmd import constants import storage_exception as se -from vdsm.betterPopen import BetterPopen +from hsmd.betterPopen import BetterPopen import logUtils
diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 47f4f1c..d28ef23 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -43,7 +43,7 @@ # If you don't have the vdsm package installed this will fail. Luckily we # don't need anything when the child spawns. Plus anything you don't have # to import is less memory taken by each helper. - from vdsm.betterPopen import BetterPopen + from hsmd.betterPopen import BetterPopen from hsmd import constants else: # We add the parent directory so that imports that import the storage
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/85/ (1/2)
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/62/ (2/2)
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1: Fails; I would prefer that you didn't submit this
Build Failed
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/85/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/62/ : UNSTABLE
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1: No score; No score
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/91/ (2/2)
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1: Fails; I would prefer that you didn't submit this
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/62/ : UNSTABLE
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/91/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
ShaoHe Feng has abandoned this change.
Change subject: move betterPopen to storage for HSM service standalone ......................................................................
Patch Set 1: Abandoned
1. for HSM service standalone, it is more better to depend the same vdsm-python rpm. but the maybe we should rename vdsm-python. 2. we will create a new branch for HSM service standalone
-- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org