Change in vdsm[master]: move numaUtils to vdsm lib

ybronhei at redhat.com ybronhei at redhat.com
Wed Jan 6 09:58:10 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: move numaUtils to vdsm lib
......................................................................

move numaUtils to vdsm lib

Change-Id: I995a3709a12f54ae59d68276762c369cfbc21a46
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/numaUtils.py
M tests/numaUtilsTests.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/supervdsmServer
M vdsm/virt/vm.py
9 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/51409/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 1210eab..a10444f 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -33,6 +33,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/netlink/link.py
 ./usr/lib/python2.7/dist-packages/vdsm/netlink/monitor.py
 ./usr/lib/python2.7/dist-packages/vdsm/netlink/route.py
+./usr/lib/python2.7/dist-packages/vdsm/numaUtils.py
 ./usr/lib/python2.7/dist-packages/vdsm/panic.py
 ./usr/lib/python2.7/dist-packages/vdsm/password.py
 ./usr/lib/python2.7/dist-packages/vdsm/ppc64HardwareInfo.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 8db17e2..ddeda7d 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -72,7 +72,6 @@
 ./usr/share/vdsm/network/tc/filter.py
 ./usr/share/vdsm/network/tc/qdisc.py
 ./usr/share/vdsm/network/utils.py
-./usr/share/vdsm/numaUtils.py
 ./usr/share/vdsm/parted_utils.py
 ./usr/share/vdsm/protocoldetector.py
 ./usr/share/vdsm/rpc/__init__.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 59f9ab5..a2e0b50 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -36,6 +36,7 @@
 	jsonrpcvdscli.py \
 	kernelconfig.py \
 	libvirtconnection.py \
+	numaUtils.py \
 	m2cutils.py \
 	netconfpersistence.py \
 	panic.py \
diff --git a/vdsm/numaUtils.py b/lib/vdsm/numaUtils.py
similarity index 100%
rename from vdsm/numaUtils.py
rename to lib/vdsm/numaUtils.py
diff --git a/tests/numaUtilsTests.py b/tests/numaUtilsTests.py
index 3b6ae6f..af52a71 100644
--- a/tests/numaUtilsTests.py
+++ b/tests/numaUtilsTests.py
@@ -27,7 +27,7 @@
 from monkeypatch import MonkeyPatchScope
 
 import caps
-import numaUtils
+from vdsm import numaUtils
 
 import vmfakelib as fake
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 827cf77..fb03d92 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -837,7 +837,6 @@
 %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
 %{_datadir}/%{vdsm_name}/parted_utils.py*
 %{_datadir}/%{vdsm_name}/mkimage.py*
-%{_datadir}/%{vdsm_name}/numaUtils.py*
 %{_datadir}/%{vdsm_name}/protocoldetector.py*
 %{_datadir}/%{vdsm_name}/sitecustomize.py*
 %{_datadir}/%{vdsm_name}/supervdsmServer
@@ -1110,6 +1109,7 @@
 %{python_sitelib}/%{vdsm_name}/network/sourceroute.py*
 %{python_sitelib}/%{vdsm_name}/network/sourceroutethread.py*
 %{python_sitelib}/%{vdsm_name}/network/utils.py*
+%{python_sitelib}/%{vdsm_name}/numaUtils.py*
 %{python_sitelib}/%{vdsm_name}/password.py*
 %{python_sitelib}/%{vdsm_name}/panic.py*
 %{python_sitelib}/%{vdsm_name}/ppc64HardwareInfo.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c536d7..cf3fda3 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -34,7 +34,6 @@
 	logUtils.py \
 	mkimage.py \
 	momIF.py \
-	numaUtils.py \
 	parted_utils.py \
 	protocoldetector.py \
 	sitecustomize.py \
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 94b7235..fe315de 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -32,11 +32,11 @@
 import logging.config
 
 from vdsm import concurrent
+from vdsm import numaUtils
 from vdsm.infra import sigutils
 from vdsm.infra import zombiereaper
 
 from caps import Architecture
-import numaUtils
 
 LOG_CONF_PATH = "/etc/vdsm/svdsm.logger.conf"
 
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 5b18b83..d31b517 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -41,6 +41,7 @@
 from vdsm import hooks
 from vdsm import libvirtconnection
 from vdsm import netinfo
+from vdsm import numaUtils
 from vdsm import qemuimg
 from vdsm import response
 from vdsm import supervdsm
@@ -58,7 +59,6 @@
 from logUtils import SimpleLogAdapter
 import caps
 import hostdev
-import numaUtils
 
 # local package imports
 from .domain_descriptor import DomainDescriptor


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I995a3709a12f54ae59d68276762c369cfbc21a46
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