Yaniv Bronhaim has uploaded a new change for review. Change subject: move momIF to lib ......................................................................
move momIF to lib Change-Id: I73701b1a2adb53f78c431da9662ac47d36be9912 Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/Makefile.am R lib/vdsm/momIF.py M tests/momTests.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/clientIF.py 8 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/54156/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index d75662d..9c9b878 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -18,6 +18,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/jsonrpcvdscli.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/momIF.py ./usr/lib/python2.7/dist-packages/vdsm/netconfpersistence.py ./usr/lib/python2.7/dist-packages/vdsm/netinfo/__init__.py ./usr/lib/python2.7/dist-packages/vdsm/netinfo/addresses.py diff --git a/debian/vdsm.install b/debian/vdsm.install index ec6fc06..0926e47 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -51,7 +51,6 @@ ./usr/share/vdsm/logUtils.py ./usr/share/vdsm/mk_sysprep_floppy ./usr/share/vdsm/mkimage.py -./usr/share/vdsm/momIF.py ./usr/share/vdsm/network/__init__.py ./usr/share/vdsm/network/api.py ./usr/share/vdsm/network/errors.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 29635ad..82bc3d4 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -42,6 +42,7 @@ kernelconfig.py \ libvirtconnection.py \ m2cutils.py \ + momIF.py \ netconfpersistence.py \ panic.py \ password.py \ diff --git a/vdsm/momIF.py b/lib/vdsm/momIF.py similarity index 98% rename from vdsm/momIF.py rename to lib/vdsm/momIF.py index 86326b5..baa25cd 100644 --- a/vdsm/momIF.py +++ b/lib/vdsm/momIF.py @@ -18,6 +18,8 @@ # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import + import logging import os import socket diff --git a/tests/momTests.py b/tests/momTests.py index 76f68e2..c727a35 100644 --- a/tests/momTests.py +++ b/tests/momTests.py @@ -20,8 +20,8 @@ from unittest import TestCase import logging import threading -from momIF import MomClient from vdsm.define import Mbytes +from vdsm.momIF import MomClient from mom import unixrpc from six.moves import configparser import os diff --git a/vdsm.spec.in b/vdsm.spec.in index d626a25..7f326b1 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1030,7 +1030,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 %{_datadir}/%{vdsm_name}/gluster/__init__.py* @@ -1104,6 +1103,7 @@ %{python_sitelib}/%{vdsm_name}/kernelconfig.py* %{python_sitelib}/%{vdsm_name}/libvirtconnection.py* %{python_sitelib}/%{vdsm_name}/m2cutils.py* +%{python_sitelib}/%{vdsm_name}/momIF.py* %{python_sitelib}/%{vdsm_name}/netinfo/__init__.py* %{python_sitelib}/%{vdsm_name}/netinfo/addresses.py* %{python_sitelib}/%{vdsm_name}/netinfo/bonding.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 76f385d..2cde3e8 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -33,7 +33,6 @@ kaxmlrpclib.py \ logUtils.py \ mkimage.py \ - momIF.py \ numaUtils.py \ parted_utils.py \ protocoldetector.py \ diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 7a7ec48..924579c 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -34,8 +34,8 @@ from yajsonrpc import Notification, JsonRpcBindingsError import alignmentScan from vdsm.config import config -from momIF import MomClient from vdsm.define import doneCode, errCode +from vdsm.momIF import MomClient from vdsm.sslcompat import sslutils import libvirt from vdsm import libvirtconnection -- To view, visit https://gerrit.ovirt.org/54156 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73701b1a2adb53f78c431da9662ac47d36be9912 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches