Change in vdsm[master]: moving kaxmlrpclib.py to lib

ybronhei at redhat.com ybronhei at redhat.com
Mon Feb 29 10:58:57 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: moving kaxmlrpclib.py to lib
......................................................................

moving kaxmlrpclib.py to lib

Change-Id: I6722a132e5a9b579e60406982c4c312efd7f2566
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/kaxmlrpclib.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/virt/migration.py
7 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/54157/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index d75662d..b7896fe 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -16,6 +16,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/hooks.py
 ./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py
 ./usr/lib/python2.7/dist-packages/vdsm/jsonrpcvdscli.py
+./usr/lib/python2.7/dist-packages/vdsm/kaxmlrpclib.py
 ./usr/lib/python2.7/dist-packages/vdsm/kernelconfig.py
 ./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py
 ./usr/lib/python2.7/dist-packages/vdsm/netconfpersistence.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index ec6fc06..f92c082 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -47,7 +47,6 @@
 ./usr/share/vdsm/hooking.py
 ./usr/share/vdsm/hostdev.py
 ./usr/share/vdsm/jobs.py
-./usr/share/vdsm/kaxmlrpclib.py
 ./usr/share/vdsm/logUtils.py
 ./usr/share/vdsm/mk_sysprep_floppy
 ./usr/share/vdsm/mkimage.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 29635ad..4ca0c97 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -39,6 +39,7 @@
 	ipwrapper.py \
 	jobs.py \
 	jsonrpcvdscli.py \
+	kaxmlrpclib.py \
 	kernelconfig.py \
 	libvirtconnection.py \
 	m2cutils.py \
diff --git a/vdsm/kaxmlrpclib.py b/lib/vdsm/kaxmlrpclib.py
similarity index 98%
rename from vdsm/kaxmlrpclib.py
rename to lib/vdsm/kaxmlrpclib.py
index 3fdf61c..e24316c 100644
--- a/vdsm/kaxmlrpclib.py
+++ b/lib/vdsm/kaxmlrpclib.py
@@ -30,6 +30,7 @@
 (TcpkeepTransport) which uses TcpkeepHTTPConnection when it
 needs to set up a connection.
 """
+from __future__ import absolute_import
 from __future__ import print_function
 
 import xmlrpclib
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d626a25..c401236 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1029,7 +1029,6 @@
 
 %{_datadir}/%{vdsm_name}/dumpStorageTable.py*
 %{_datadir}/%{vdsm_name}/get-conf-item
-%{_datadir}/%{vdsm_name}/kaxmlrpclib.py*
 %{_datadir}/%{vdsm_name}/momIF.py*
 %{_datadir}/%{vdsm_name}/set-conf-item
 %dir %{_datadir}/%{vdsm_name}/gluster
@@ -1101,6 +1100,7 @@
 %{python_sitelib}/%{vdsm_name}/ipwrapper.py*
 %{python_sitelib}/%{vdsm_name}/jobs.py*
 %{python_sitelib}/%{vdsm_name}/jsonrpcvdscli.py*
+%{python_sitelib}/%{vdsm_name}/kaxmlrpclib.py*
 %{python_sitelib}/%{vdsm_name}/kernelconfig.py*
 %{python_sitelib}/%{vdsm_name}/libvirtconnection.py*
 %{python_sitelib}/%{vdsm_name}/m2cutils.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 76f385d..c9b0c89 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -30,7 +30,6 @@
 	clientIF.py \
 	hooking.py \
 	hostdev.py \
-	kaxmlrpclib.py \
 	logUtils.py \
 	mkimage.py \
 	momIF.py \
diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py
index 09f031e..67feb19 100644
--- a/vdsm/virt/migration.py
+++ b/vdsm/virt/migration.py
@@ -22,8 +22,8 @@
 import time
 import libvirt
 
-import kaxmlrpclib
 from vdsm import hooks
+from vdsm import kaxmlrpclib
 from vdsm import response
 from vdsm import utils
 from vdsm import vdscli


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6722a132e5a9b579e60406982c4c312efd7f2566
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list