Change in vdsm[master]: move hooks.py under lib/vdsm

ibarkan at redhat.com ibarkan at redhat.com
Wed Dec 9 13:56:02 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: move hooks.py under lib/vdsm
......................................................................

move hooks.py under lib/vdsm

This module is used from within lib/vdsm/network/ files so must not be
located under /usr/share/vdsm.

Change-Id: I670636d685f5663d891ae920d409c19cb9dda189
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M init/vdsmd_init_common.sh.in
M lib/vdsm/Makefile.am
R lib/vdsm/hooks.py
M lib/vdsm/network/api.py
M lib/vdsm/network/configurators/ifcfg.py
M tests/hooksTests.py
M tests/hostdevTests.py
M tests/vmOperationsTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/caps.py
M vdsm/hostdev.py
M vdsm/virt/migration.py
M vdsm/virt/vm.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
18 files changed, 18 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/50173/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index cdef597..14cffc5 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -10,6 +10,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/dmidecodeUtil.py
 ./usr/lib/python2.7/dist-packages/vdsm/exception.py
 ./usr/lib/python2.7/dist-packages/vdsm/executor.py
+./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/kernelconfig.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 007913b..8495a4c 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -45,7 +45,6 @@
 ./usr/share/vdsm/gluster/cli.py
 ./usr/share/vdsm/gluster/exception.py
 ./usr/share/vdsm/hooking.py
-./usr/share/vdsm/hooks.py
 ./usr/share/vdsm/hostdev.py
 ./usr/share/vdsm/jobs.py
 ./usr/share/vdsm/kaxmlrpclib.py
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index b8ed328..3857363 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -110,7 +110,7 @@
 }
 
 task_run_init_hooks(){
-    "@PYTHON@" "@VDSMDIR@/hooks.pyc" before_vdsm_start
+    "@PYTHON@" -m "vdsm.hooks" before_vdsm_start
 }
 
 
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index b410d96..59f9ab5 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -30,6 +30,7 @@
 	dmidecodeUtil.py \
 	exception.py \
 	executor.py \
+	hooks.py \
 	ipwrapper.py \
 	jobs.py \
 	jsonrpcvdscli.py \
diff --git a/vdsm/hooks.py b/lib/vdsm/hooks.py
similarity index 99%
rename from vdsm/hooks.py
rename to lib/vdsm/hooks.py
index 45068a2..bf5520f 100644
--- a/vdsm/hooks.py
+++ b/lib/vdsm/hooks.py
@@ -19,7 +19,6 @@
 #
 
 from __future__ import print_function
-from vdsm import utils
 import glob
 import hashlib
 import itertools
@@ -30,7 +29,8 @@
 import sys
 import tempfile
 
-from vdsm.constants import P_VDSM_HOOKS, P_VDSM
+from . import utils
+from .constants import P_VDSM_HOOKS, P_VDSM
 
 
 class HookError(Exception):
diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index c31111e..d5a437c 100755
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -30,6 +30,7 @@
 
 from vdsm.config import config
 from vdsm import constants
+from vdsm import hooks
 from vdsm import kernelconfig
 from vdsm import netconfpersistence
 from vdsm.netinfo import (addresses, libvirtNets2vdsm, bridges,
@@ -45,7 +46,6 @@
 from . import errors as ne
 from .models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
 from .models import hierarchy_backing_device
-import hooks  # TODO: Turn into parent package import when vdsm is a package
 
 CONNECTIVITY_TIMEOUT_DEFAULT = 4
 _SYSFS_SRIOV_NUMVFS = '/sys/bus/pci/devices/{}/sriov_numvfs'
diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index 74160d0..f273e99 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -22,7 +22,6 @@
 import copy
 import errno
 import glob
-import hooks
 import logging
 import os
 import pipes
@@ -38,6 +37,7 @@
 from vdsm.config import config
 from vdsm import cmdutils
 from vdsm import constants
+from vdsm import hooks
 from vdsm import ipwrapper
 from vdsm.netinfo import (bonding as netinfo_bonding, mtus, nics, vlans,
                           ifaceUsed, NET_PATH, misc)
diff --git a/tests/hooksTests.py b/tests/hooksTests.py
index 03c0a79..2fd401b 100644
--- a/tests/hooksTests.py
+++ b/tests/hooksTests.py
@@ -28,7 +28,7 @@
 from testlib import VdsmTestCase as TestCaseBase
 from testlib import namedTemporaryDir
 
-import hooks
+from vdsm import hooks
 
 
 class TestHooks(TestCaseBase):
diff --git a/tests/hostdevTests.py b/tests/hostdevTests.py
index c4db4ff..02518fe 100644
--- a/tests/hostdevTests.py
+++ b/tests/hostdevTests.py
@@ -18,7 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-import hooks
+
 import hostdev
 import vmfakelib as fake
 
@@ -28,6 +28,7 @@
 from testlib import permutations, expandPermutations
 from monkeypatch import MonkeyClass
 
+from vdsm import hooks
 from vdsm import libvirtconnection
 
 _PCI_DEVICES = ['pci_0000_00_1a_0', 'pci_0000_00_1f_2', 'pci_0000_00_02_0',
diff --git a/tests/vmOperationsTests.py b/tests/vmOperationsTests.py
index 79067bc..a9de9c4 100644
--- a/tests/vmOperationsTests.py
+++ b/tests/vmOperationsTests.py
@@ -23,12 +23,11 @@
 
 from nose.plugins.skip import SkipTest
 
-import hooks
-
 from virt import virdomain
 from virt import vmexitreason
 from virt.vmdevices import hwclass
 from vdsm import define
+from vdsm import hooks
 from vdsm import libvirtconnection
 from vdsm import password
 from vdsm import response
diff --git a/vdsm.spec.in b/vdsm.spec.in
index a300c7f..d997d8f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -841,7 +841,6 @@
 %{_datadir}/%{vdsm_name}/daemonAdapter
 %{_datadir}/%{vdsm_name}/API.py*
 %{_datadir}/%{vdsm_name}/hooking.py*
-%{_datadir}/%{vdsm_name}/hooks.py*
 %{_datadir}/%{vdsm_name}/hostdev.py*
 %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
 %{_datadir}/%{vdsm_name}/parted_utils.py*
@@ -1078,6 +1077,7 @@
 %{python_sitelib}/%{vdsm_name}/dmidecodeUtil.py*
 %{python_sitelib}/%{vdsm_name}/exception.py*
 %{python_sitelib}/%{vdsm_name}/executor.py*
+%{python_sitelib}/%{vdsm_name}/hooks.py*
 %{python_sitelib}/%{vdsm_name}/ipwrapper.py*
 %{python_sitelib}/%{vdsm_name}/jobs.py*
 %{python_sitelib}/%{vdsm_name}/jsonrpcvdscli.py*
diff --git a/vdsm/API.py b/vdsm/API.py
index 99a368b..5a76737 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -35,6 +35,7 @@
 from vdsm import utils
 from clientIF import clientIF
 from vdsm import constants
+from vdsm import hooks
 from vdsm import response
 from vdsm import supervdsm
 import storage.misc
@@ -52,7 +53,6 @@
 from vdsm.define import doneCode, errCode, Kbytes, Mbytes
 import caps
 from vdsm.config import config
-import hooks
 import hostdev
 from caps import PAGE_SIZE_BYTES
 import v2v
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 9bc85b1..3bb6ea8 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -29,7 +29,6 @@
 	caps.py \
 	clientIF.py \
 	hooking.py \
-	hooks.py \
 	hostdev.py \
 	kaxmlrpclib.py \
 	logUtils.py \
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 5de7ff9..209158b 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -34,10 +34,10 @@
 import libvirt
 
 from vdsm.config import config
+from vdsm import hooks
 from vdsm import libvirtconnection
 import dsaversion
 from vdsm import netinfo
-import hooks
 from vdsm import utils
 import storage.hba
 
diff --git a/vdsm/hostdev.py b/vdsm/hostdev.py
index c3b5115..89c5366 100644
--- a/vdsm/hostdev.py
+++ b/vdsm/hostdev.py
@@ -20,7 +20,7 @@
 
 import xml.etree.ElementTree as etree
 
-import hooks
+from vdsm import hooks
 from vdsm import libvirtconnection
 from vdsm import supervdsm
 
diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py
index 7d8b374..afd54c4 100644
--- a/vdsm/virt/migration.py
+++ b/vdsm/virt/migration.py
@@ -22,8 +22,8 @@
 import time
 import libvirt
 
-import hooks
 import kaxmlrpclib
+from vdsm import hooks
 from vdsm import response
 from vdsm import utils
 from vdsm import vdscli
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 5d07048..ce43528 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -38,6 +38,7 @@
 # vdsm imports
 from vdsm import concurrent
 from vdsm import constants
+from vdsm import hooks
 from vdsm import libvirtconnection
 from vdsm import netinfo
 from vdsm import qemuimg
@@ -56,7 +57,6 @@
 # In future those should be imported via ..
 from logUtils import SimpleLogAdapter
 import caps
-import hooks
 import hostdev
 import numaUtils
 
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py
index fa8cfb5..4225f5a 100755
--- a/vdsm_hooks/ovs/ovs_before_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup.py
@@ -32,6 +32,7 @@
 from libvirt import libvirtError
 import six
 
+from vdsm import hooks
 from vdsm.netconfpersistence import RunningConfig
 
 from hooking import execCmd
@@ -207,7 +208,6 @@
 
 
 def test_add():
-    import hooks
     _execCmd([EXT_OVS_VSCTL, 'show'])
     json_input = {
         'request': {
@@ -229,7 +229,6 @@
 
 
 def test_del():
-    import hooks
     _execCmd([EXT_OVS_VSCTL, 'show'])
     json_input = {'request': {'networks': {'ovs-test-net': {'remove': True}},
                               'bondings': {'bond1515': {'remove': True}}}}


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I670636d685f5663d891ae920d409c19cb9dda189
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list