Change in vdsm[master]: Move hooking.py to vdsm/lib

ybronhei at redhat.com ybronhei at redhat.com
Sat Jan 23 17:37:41 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: Move hooking.py to vdsm/lib
......................................................................

Move hooking.py to vdsm/lib

Change-Id: Ic03bd214cafc93e7c38de7d4aff6ef98753c55f9
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/hooking.py
M tests/hooksTests.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm_hooks/allocate_net/before_device_create.py
M vdsm_hooks/checkimages/before_vm_start.py
M vdsm_hooks/diskunmap/before_vm_start.py
M vdsm_hooks/ethtool_options/ethtool_options.py
M vdsm_hooks/extnet/extnet_vnic.py
M vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
M vdsm_hooks/fakesriov/after_hostdev_list_by_caps.py
M vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
M vdsm_hooks/faqemu/before_vm_start.py
M vdsm_hooks/fileinject/before_vm_start.py
M vdsm_hooks/floppy/before_vm_start.py
M vdsm_hooks/hostusb/after_vm_destroy.py
M vdsm_hooks/hostusb/before_vm_start.py
M vdsm_hooks/httpsisoboot/before_vm_start.py
M vdsm_hooks/hugepages/before_vm_migrate_destination.py
M vdsm_hooks/hugepages/before_vm_start.py
M vdsm_hooks/ipv6/ipv6.py
M vdsm_hooks/isolatedprivatevlan/before_vm_start.py
M vdsm_hooks/macbind/before_vm_start.py
M vdsm_hooks/macspoof/before_vm_start.py
M vdsm_hooks/macspoof/macspoof_vnic.py
M vdsm_hooks/nestedvt/before_vm_start.py
M vdsm_hooks/noipspoof/noipspoof.py
M vdsm_hooks/numa/before_vm_start.py
M vdsm_hooks/openstacknet/after_device_create.py
M vdsm_hooks/openstacknet/after_device_destroy.py
M vdsm_hooks/openstacknet/before_device_create.py
M vdsm_hooks/openstacknet/before_device_migrate_destination.py
M vdsm_hooks/openstacknet/openstacknet_utils.py
M vdsm_hooks/ovs/ovs_after_get_caps.py
M vdsm_hooks/ovs/ovs_after_get_stats.py
M vdsm_hooks/ovs/ovs_after_network_setup.py
M vdsm_hooks/ovs/ovs_before_device_create.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
M vdsm_hooks/ovs/ovs_utils.py
M vdsm_hooks/pincpu/before_vm_start.py
M vdsm_hooks/promisc/after_vm_start.py
M vdsm_hooks/promisc/before_vm_destroy.py
M vdsm_hooks/qemucmdline/before_vm_start.py
M vdsm_hooks/qos/before_vm_start.py
M vdsm_hooks/scratchpad/before_vm_start.py
M vdsm_hooks/smbios/before_vm_start.py
M vdsm_hooks/spiceoptions/before_vm_start.py
M vdsm_hooks/vhostmd/after_vm_destroy.py
M vdsm_hooks/vhostmd/before_vm_start.py
M vdsm_hooks/vmdisk/before_vm_start.py
M vdsm_hooks/vmfex/before_vm_start.py
M vdsm_hooks/vmfex_dev/vmfex_vnic.py
56 files changed, 57 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/52647/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 9650d9d..353b910 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -13,6 +13,7 @@
 ./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/health.py
+./usr/lib/python2.7/dist-packages/vdsm/hooking.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
diff --git a/debian/vdsm.install b/debian/vdsm.install
index e4cbcaa..f3307d5 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -44,7 +44,6 @@
 ./usr/share/vdsm/gluster/__init__.py
 ./usr/share/vdsm/gluster/cli.py
 ./usr/share/vdsm/gluster/exception.py
-./usr/share/vdsm/hooking.py
 ./usr/share/vdsm/hostdev.py
 ./usr/share/vdsm/jobs.py
 ./usr/share/vdsm/kaxmlrpclib.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index a1628ab..4a30cd3 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -34,6 +34,7 @@
 	exception.py \
 	executor.py \
 	health.py \
+	hooking.py \
 	hooks.py \
 	host.py \
 	ipwrapper.py \
diff --git a/vdsm/hooking.py b/lib/vdsm/hooking.py
similarity index 100%
rename from vdsm/hooking.py
rename to lib/vdsm/hooking.py
diff --git a/tests/hooksTests.py b/tests/hooksTests.py
index 2fd401b..c9791f1 100644
--- a/tests/hooksTests.py
+++ b/tests/hooksTests.py
@@ -112,7 +112,7 @@
                 code = """#!/usr/bin/python
 
 import os
-import hooking
+from vdsm import hooking
 
 domXMLFile = open(os.environ['_hook_domxml'], 'a')
 customProperty = os.environ['customProperty']
diff --git a/vdsm.spec.in b/vdsm.spec.in
index a03633b..da67059 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -842,7 +842,6 @@
 %{_datadir}/%{vdsm_name}/clientIF.py*
 %{_datadir}/%{vdsm_name}/daemonAdapter
 %{_datadir}/%{vdsm_name}/API.py*
-%{_datadir}/%{vdsm_name}/hooking.py*
 %{_datadir}/%{vdsm_name}/hostdev.py*
 %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
 %{_datadir}/%{vdsm_name}/parted_utils.py*
@@ -1086,6 +1085,7 @@
 %{python_sitelib}/%{vdsm_name}/exception.py*
 %{python_sitelib}/%{vdsm_name}/executor.py*
 %{python_sitelib}/%{vdsm_name}/health.py*
+%{python_sitelib}/%{vdsm_name}/hooking.py*
 %{python_sitelib}/%{vdsm_name}/hooks.py*
 %{python_sitelib}/%{vdsm_name}/host.py*
 %{python_sitelib}/%{vdsm_name}/ipwrapper.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index f9f8aac..025ae24 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -28,7 +28,6 @@
 	blkid.py \
 	caps.py \
 	clientIF.py \
-	hooking.py \
 	hostdev.py \
 	kaxmlrpclib.py \
 	logUtils.py \
diff --git a/vdsm_hooks/allocate_net/before_device_create.py b/vdsm_hooks/allocate_net/before_device_create.py
index af32bef..9d4f579 100644
--- a/vdsm_hooks/allocate_net/before_device_create.py
+++ b/vdsm_hooks/allocate_net/before_device_create.py
@@ -26,7 +26,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 AVAIL_NETS_KEY = 'equivnets'
 HELP_ARG = "-h"
 TEST_ARG = "-t"
diff --git a/vdsm_hooks/checkimages/before_vm_start.py b/vdsm_hooks/checkimages/before_vm_start.py
index 40a1326..7aa48bf 100755
--- a/vdsm_hooks/checkimages/before_vm_start.py
+++ b/vdsm_hooks/checkimages/before_vm_start.py
@@ -5,7 +5,7 @@
 import traceback
 import fcntl
 import struct
-import hooking
+from vdsm import hooking
 
 BLKGETSIZE64 = 0x80081272  # Obtain device size in bytes
 FORMAT = 'L'
diff --git a/vdsm_hooks/diskunmap/before_vm_start.py b/vdsm_hooks/diskunmap/before_vm_start.py
index a73bcbd..905e41c 100644
--- a/vdsm_hooks/diskunmap/before_vm_start.py
+++ b/vdsm_hooks/diskunmap/before_vm_start.py
@@ -35,7 +35,7 @@
 import traceback
 from xml.dom import minidom
 
-import hooking
+from vdsm import hooking
 
 
 def addDiscardUnmap(domxml):
diff --git a/vdsm_hooks/ethtool_options/ethtool_options.py b/vdsm_hooks/ethtool_options/ethtool_options.py
index 29b2807..6994a62 100644
--- a/vdsm_hooks/ethtool_options/ethtool_options.py
+++ b/vdsm_hooks/ethtool_options/ethtool_options.py
@@ -20,9 +20,9 @@
 from __future__ import print_function
 from collections import namedtuple
 import sys
-import hooking
 import traceback
 
+from vdsm import hooking
 from vdsm import netinfo
 from vdsm.utils import CommandPath
 
diff --git a/vdsm_hooks/extnet/extnet_vnic.py b/vdsm_hooks/extnet/extnet_vnic.py
index 063f8df..9580bf0 100755
--- a/vdsm_hooks/extnet/extnet_vnic.py
+++ b/vdsm_hooks/extnet/extnet_vnic.py
@@ -17,7 +17,7 @@
 import traceback
 import xml.dom
 
-import hooking
+from vdsm import hooking
 
 
 def replaceSource(interface, newnet):
diff --git a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
index bcef83e..8f5a1da 100644
--- a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
+++ b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
@@ -19,9 +19,9 @@
 #
 from __future__ import print_function
 import sys
-import hooking
 import traceback
 
+from vdsm import hooking
 from vdsm import ipwrapper
 from vdsm import netinfo
 from vdsm import utils
diff --git a/vdsm_hooks/fakesriov/after_hostdev_list_by_caps.py b/vdsm_hooks/fakesriov/after_hostdev_list_by_caps.py
index 7fa3079..46eecdb 100644
--- a/vdsm_hooks/fakesriov/after_hostdev_list_by_caps.py
+++ b/vdsm_hooks/fakesriov/after_hostdev_list_by_caps.py
@@ -22,7 +22,7 @@
 """
 To Enable this set fake_sriov_enable=true in /etc/vdsm/vdsm.conf.
 """
-import hooking
+from vdsm import hooking
 from vdsm.config import config
 
 _PF_DEVICE_NAME = 'enp22s0f0'
diff --git a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
index 9f2002b..7463c38 100644
--- a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
+++ b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
@@ -27,7 +27,7 @@
     VDSM/configOverride=bool:False
     VDSM_CONFIG/fake_vmstats_enable=str:true
 """
-import hooking
+from vdsm import hooking
 import random
 
 from vdsm.config import config
diff --git a/vdsm_hooks/faqemu/before_vm_start.py b/vdsm_hooks/faqemu/before_vm_start.py
index 73a1d05..0642540 100644
--- a/vdsm_hooks/faqemu/before_vm_start.py
+++ b/vdsm_hooks/faqemu/before_vm_start.py
@@ -19,7 +19,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-import hooking
+from vdsm import hooking
 from vdsm.config import config
 
 if config.getboolean('vars', 'fake_kvm_support'):
diff --git a/vdsm_hooks/fileinject/before_vm_start.py b/vdsm_hooks/fileinject/before_vm_start.py
index 5763b48..b75ee59 100755
--- a/vdsm_hooks/fileinject/before_vm_start.py
+++ b/vdsm_hooks/fileinject/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 import guestfs
 
diff --git a/vdsm_hooks/floppy/before_vm_start.py b/vdsm_hooks/floppy/before_vm_start.py
index 7616ac6..ff8e863 100755
--- a/vdsm_hooks/floppy/before_vm_start.py
+++ b/vdsm_hooks/floppy/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/hostusb/after_vm_destroy.py b/vdsm_hooks/hostusb/after_vm_destroy.py
index 2603066..bb1be8f 100755
--- a/vdsm_hooks/hostusb/after_vm_destroy.py
+++ b/vdsm_hooks/hostusb/after_vm_destroy.py
@@ -5,7 +5,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 
 '''
 after_vm_destroy:
diff --git a/vdsm_hooks/hostusb/before_vm_start.py b/vdsm_hooks/hostusb/before_vm_start.py
index 5403515..2951ccc 100755
--- a/vdsm_hooks/hostusb/before_vm_start.py
+++ b/vdsm_hooks/hostusb/before_vm_start.py
@@ -7,7 +7,7 @@
 import pwd
 import traceback
 
-import hooking
+from vdsm import hooking
 
 '''
 host usb hook
diff --git a/vdsm_hooks/httpsisoboot/before_vm_start.py b/vdsm_hooks/httpsisoboot/before_vm_start.py
index b0bd688..d4c4e42 100755
--- a/vdsm_hooks/httpsisoboot/before_vm_start.py
+++ b/vdsm_hooks/httpsisoboot/before_vm_start.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-import hooking
+from vdsm import hooking
 import sys
 import traceback
 import urlparse
diff --git a/vdsm_hooks/hugepages/before_vm_migrate_destination.py b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
index af1c4af..7495002 100755
--- a/vdsm_hooks/hugepages/before_vm_migrate_destination.py
+++ b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
@@ -4,7 +4,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 
 NUMBER_OF_HUGETPAGES = '/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages'
 
diff --git a/vdsm_hooks/hugepages/before_vm_start.py b/vdsm_hooks/hugepages/before_vm_start.py
index 37b655e..1229c3d 100755
--- a/vdsm_hooks/hugepages/before_vm_start.py
+++ b/vdsm_hooks/hugepages/before_vm_start.py
@@ -4,7 +4,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 
 '''
 hugepages vdsm hook
diff --git a/vdsm_hooks/ipv6/ipv6.py b/vdsm_hooks/ipv6/ipv6.py
index 6c00475..39a8ce0 100644
--- a/vdsm_hooks/ipv6/ipv6.py
+++ b/vdsm_hooks/ipv6/ipv6.py
@@ -17,7 +17,7 @@
 #
 # Refer to the README and COPYING files for full details of the license
 #
-import hooking
+from vdsm import hooking
 import traceback
 
 
diff --git a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
index 722bf59..403aa36 100755
--- a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
+++ b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 
 filtername = 'isolatedprivatevlan-vdsm'
diff --git a/vdsm_hooks/macbind/before_vm_start.py b/vdsm_hooks/macbind/before_vm_start.py
index a670ab2..d796798 100644
--- a/vdsm_hooks/macbind/before_vm_start.py
+++ b/vdsm_hooks/macbind/before_vm_start.py
@@ -40,7 +40,7 @@
 import xml.dom
 from vdsm.ipwrapper import Link
 
-import hooking
+from vdsm import hooking
 
 
 def createElement(domxml, element, attribute, attributeValue):
diff --git a/vdsm_hooks/macspoof/before_vm_start.py b/vdsm_hooks/macspoof/before_vm_start.py
index af258ff..b883265 100755
--- a/vdsm_hooks/macspoof/before_vm_start.py
+++ b/vdsm_hooks/macspoof/before_vm_start.py
@@ -2,7 +2,7 @@
 
 from __future__ import print_function
 import os
-import hooking
+from vdsm import hooking
 
 
 def removeMacSpoofingFilter(interface):
diff --git a/vdsm_hooks/macspoof/macspoof_vnic.py b/vdsm_hooks/macspoof/macspoof_vnic.py
index 4840244..89b50ff 100755
--- a/vdsm_hooks/macspoof/macspoof_vnic.py
+++ b/vdsm_hooks/macspoof/macspoof_vnic.py
@@ -9,7 +9,7 @@
 
 
 import os
-import hooking
+from vdsm import hooking
 
 
 def removeMacSpoofingFilter(interface):
diff --git a/vdsm_hooks/nestedvt/before_vm_start.py b/vdsm_hooks/nestedvt/before_vm_start.py
index 5ea71f4..727c70a 100755
--- a/vdsm_hooks/nestedvt/before_vm_start.py
+++ b/vdsm_hooks/nestedvt/before_vm_start.py
@@ -19,7 +19,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-import hooking
+from vdsm import hooking
 
 cpu_nested_features = {
     "kvm_intel": "vmx",
diff --git a/vdsm_hooks/noipspoof/noipspoof.py b/vdsm_hooks/noipspoof/noipspoof.py
index 20d35c9..d26a8d3 100755
--- a/vdsm_hooks/noipspoof/noipspoof.py
+++ b/vdsm_hooks/noipspoof/noipspoof.py
@@ -22,7 +22,7 @@
 import os
 import sys
 
-import hooking
+from vdsm import hooking
 
 
 def replaceMacSpoofingFilter(interface, IPs):
diff --git a/vdsm_hooks/numa/before_vm_start.py b/vdsm_hooks/numa/before_vm_start.py
index cefdb6f..340d8ae 100755
--- a/vdsm_hooks/numa/before_vm_start.py
+++ b/vdsm_hooks/numa/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py
index ce1210d..150ceaa 100755
--- a/vdsm_hooks/openstacknet/after_device_create.py
+++ b/vdsm_hooks/openstacknet/after_device_create.py
@@ -25,7 +25,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 from openstacknet_utils import DUMMY_BRIDGE
 from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE
 from openstacknet_utils import PLUGIN_TYPE_KEY
diff --git a/vdsm_hooks/openstacknet/after_device_destroy.py b/vdsm_hooks/openstacknet/after_device_destroy.py
index 3cc7261..69e821b 100755
--- a/vdsm_hooks/openstacknet/after_device_destroy.py
+++ b/vdsm_hooks/openstacknet/after_device_destroy.py
@@ -16,7 +16,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 from openstacknet_utils import EXT_BRCTL
 from openstacknet_utils import EXT_IP
 from openstacknet_utils import INTEGRATION_BRIDGE
diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py
index c37f81a..e19bc79 100755
--- a/vdsm_hooks/openstacknet/before_device_create.py
+++ b/vdsm_hooks/openstacknet/before_device_create.py
@@ -36,7 +36,7 @@
 import traceback
 from xml.dom import minidom
 
-import hooking
+from vdsm import hooking
 from openstacknet_utils import DUMMY_BRIDGE
 from openstacknet_utils import INTEGRATION_BRIDGE
 from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE
diff --git a/vdsm_hooks/openstacknet/before_device_migrate_destination.py b/vdsm_hooks/openstacknet/before_device_migrate_destination.py
index cc6fc76..c9c35e6 100755
--- a/vdsm_hooks/openstacknet/before_device_migrate_destination.py
+++ b/vdsm_hooks/openstacknet/before_device_migrate_destination.py
@@ -25,7 +25,7 @@
     security_groups will trigger the correct behavior for enabling security
     groups support, mainly when using OVS. The value is unimportant.
 """
-import hooking
+from vdsm import hooking
 import os
 import sys
 import traceback
diff --git a/vdsm_hooks/openstacknet/openstacknet_utils.py b/vdsm_hooks/openstacknet/openstacknet_utils.py
index 11623e7..795a761 100644
--- a/vdsm_hooks/openstacknet/openstacknet_utils.py
+++ b/vdsm_hooks/openstacknet/openstacknet_utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 from __future__ import print_function
-import hooking
+from vdsm import hooking
 import subprocess
 from vdsm.netinfo import DUMMY_BRIDGE
 from vdsm.utils import CommandPath
diff --git a/vdsm_hooks/ovs/ovs_after_get_caps.py b/vdsm_hooks/ovs/ovs_after_get_caps.py
index 203a869..0483427 100755
--- a/vdsm_hooks/ovs/ovs_after_get_caps.py
+++ b/vdsm_hooks/ovs/ovs_after_get_caps.py
@@ -24,8 +24,9 @@
 from vdsm.netconfpersistence import RunningConfig
 from vdsm.netinfo import dhcp, routes as netinfo_routes, addresses, mtus
 
-from hooking import execCmd
-import hooking
+from vdsm.hooking import execCmd
+from vdsm import hooking
+
 
 from ovs_utils import (get_bond_options, iter_ovs_nets, iter_ovs_bonds,
                        EXT_OVS_APPCTL, EXT_OVS_VSCTL, BRIDGE_NAME)
diff --git a/vdsm_hooks/ovs/ovs_after_get_stats.py b/vdsm_hooks/ovs/ovs_after_get_stats.py
index 9e8e1bf..d8328ca 100755
--- a/vdsm_hooks/ovs/ovs_after_get_stats.py
+++ b/vdsm_hooks/ovs/ovs_after_get_stats.py
@@ -24,7 +24,7 @@
 
 from vdsm.netconfpersistence import RunningConfig
 
-import hooking
+from vdsm import hooking
 
 from ovs_utils import is_ovs_network
 import ovs_utils
diff --git a/vdsm_hooks/ovs/ovs_after_network_setup.py b/vdsm_hooks/ovs/ovs_after_network_setup.py
index 560ede3..19c7831 100755
--- a/vdsm_hooks/ovs/ovs_after_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_after_network_setup.py
@@ -22,7 +22,7 @@
 import os
 import traceback
 
-import hooking
+from vdsm import hooking
 
 from ovs_utils import INIT_CONFIG_FILE
 import ovs_utils
diff --git a/vdsm_hooks/ovs/ovs_before_device_create.py b/vdsm_hooks/ovs/ovs_before_device_create.py
index 329a6ef..c2675b0 100755
--- a/vdsm_hooks/ovs/ovs_before_device_create.py
+++ b/vdsm_hooks/ovs/ovs_before_device_create.py
@@ -22,7 +22,7 @@
 
 from vdsm.netconfpersistence import RunningConfig
 
-import hooking
+from vdsm import hooking
 
 from ovs_utils import is_ovs_network, BRIDGE_NAME
 
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py
index 7cfbb22..ebde832 100755
--- a/vdsm_hooks/ovs/ovs_before_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup.py
@@ -37,8 +37,8 @@
 from vdsm.netconfpersistence import RunningConfig
 from vdsm.network.configurators import libvirt
 
-from hooking import execCmd
-import hooking
+from vdsm.hooking import execCmd
+from vdsm import hooking
 
 from ovs_utils import (is_ovs_network, is_ovs_bond, iter_ovs_nets, suppress,
                        destroy_ovs_bridge, ovs_bridge_exists, EXT_IP,
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
index c8a9238..bcfe144 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
@@ -24,7 +24,7 @@
 from vdsm.netinfo import CachingNetInfo
 from vdsm.network.configurators import libvirt
 
-import hooking
+from vdsm import hooking
 
 from ovs_utils import (get_bond_options, is_ovs_bond, iter_ovs_nets,
                        iter_ovs_bonds, rget, suppress, destroy_ovs_bridge,
diff --git a/vdsm_hooks/ovs/ovs_utils.py b/vdsm_hooks/ovs/ovs_utils.py
index ed2ce01..b4b60a3 100644
--- a/vdsm_hooks/ovs/ovs_utils.py
+++ b/vdsm_hooks/ovs/ovs_utils.py
@@ -21,8 +21,8 @@
 
 import six
 
-from hooking import execCmd
-import hooking
+from vdsm.hooking import execCmd
+from vdsm import hooking
 
 from vdsm.utils import CommandPath
 
diff --git a/vdsm_hooks/pincpu/before_vm_start.py b/vdsm_hooks/pincpu/before_vm_start.py
index 6ea4528..de15a88 100755
--- a/vdsm_hooks/pincpu/before_vm_start.py
+++ b/vdsm_hooks/pincpu/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/promisc/after_vm_start.py b/vdsm_hooks/promisc/after_vm_start.py
index ea62347..048e328 100755
--- a/vdsm_hooks/promisc/after_vm_start.py
+++ b/vdsm_hooks/promisc/after_vm_start.py
@@ -4,7 +4,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 
 MODE_MIRROR = 'mirror'
 MODE_INLINE = 'redirect'
diff --git a/vdsm_hooks/promisc/before_vm_destroy.py b/vdsm_hooks/promisc/before_vm_destroy.py
index d041c19..026de6a 100755
--- a/vdsm_hooks/promisc/before_vm_destroy.py
+++ b/vdsm_hooks/promisc/before_vm_destroy.py
@@ -4,7 +4,7 @@
 import sys
 import traceback
 
-import hooking
+from vdsm import hooking
 
 
 def removeMirrorNetwork(networkName):
diff --git a/vdsm_hooks/qemucmdline/before_vm_start.py b/vdsm_hooks/qemucmdline/before_vm_start.py
index b3b9214..9634ef4 100755
--- a/vdsm_hooks/qemucmdline/before_vm_start.py
+++ b/vdsm_hooks/qemucmdline/before_vm_start.py
@@ -21,7 +21,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 import json
 
diff --git a/vdsm_hooks/qos/before_vm_start.py b/vdsm_hooks/qos/before_vm_start.py
index d9a3ada..32ccd02 100755
--- a/vdsm_hooks/qos/before_vm_start.py
+++ b/vdsm_hooks/qos/before_vm_start.py
@@ -3,7 +3,7 @@
 import os
 import sys
 import ast
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/scratchpad/before_vm_start.py b/vdsm_hooks/scratchpad/before_vm_start.py
index ef851a4..d9c0b0a 100755
--- a/vdsm_hooks/scratchpad/before_vm_start.py
+++ b/vdsm_hooks/scratchpad/before_vm_start.py
@@ -6,7 +6,7 @@
 import traceback
 import stat
 
-import hooking
+from vdsm import hooking
 
 '''
 scratchpad vdsm hook
diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py
index 55635a9..360427f 100755
--- a/vdsm_hooks/smbios/before_vm_start.py
+++ b/vdsm_hooks/smbios/before_vm_start.py
@@ -3,7 +3,7 @@
 import os
 import sys
 import ast
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/spiceoptions/before_vm_start.py b/vdsm_hooks/spiceoptions/before_vm_start.py
index 465900e..b51bfe3 100755
--- a/vdsm_hooks/spiceoptions/before_vm_start.py
+++ b/vdsm_hooks/spiceoptions/before_vm_start.py
@@ -7,7 +7,7 @@
 import traceback
 from xml.dom import minidom
 
-import hooking
+from vdsm import hooking
 
 
 '''
diff --git a/vdsm_hooks/vhostmd/after_vm_destroy.py b/vdsm_hooks/vhostmd/after_vm_destroy.py
index e8887bd..d3d1aad 100644
--- a/vdsm_hooks/vhostmd/after_vm_destroy.py
+++ b/vdsm_hooks/vhostmd/after_vm_destroy.py
@@ -21,7 +21,7 @@
 
 import os
 import subprocess
-import hooking
+from vdsm import hooking
 from vdsm import vdscli
 
 s = vdscli.connect()
diff --git a/vdsm_hooks/vhostmd/before_vm_start.py b/vdsm_hooks/vhostmd/before_vm_start.py
index 47d0d0d..f1a9e2c 100644
--- a/vdsm_hooks/vhostmd/before_vm_start.py
+++ b/vdsm_hooks/vhostmd/before_vm_start.py
@@ -21,7 +21,7 @@
 
 import os
 import subprocess
-import hooking
+from vdsm import hooking
 
 
 if hooking.tobool(os.environ.get('sap_agent', False)):
diff --git a/vdsm_hooks/vmdisk/before_vm_start.py b/vdsm_hooks/vmdisk/before_vm_start.py
index e599b6c..22b22fd 100755
--- a/vdsm_hooks/vmdisk/before_vm_start.py
+++ b/vdsm_hooks/vmdisk/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 
 '''
diff --git a/vdsm_hooks/vmfex/before_vm_start.py b/vdsm_hooks/vmfex/before_vm_start.py
index c1f9418..d224e76 100755
--- a/vdsm_hooks/vmfex/before_vm_start.py
+++ b/vdsm_hooks/vmfex/before_vm_start.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import hooking
+from vdsm import hooking
 import traceback
 import fcntl
 import ast
diff --git a/vdsm_hooks/vmfex_dev/vmfex_vnic.py b/vdsm_hooks/vmfex_dev/vmfex_vnic.py
index 780ebba..ca873b6 100755
--- a/vdsm_hooks/vmfex_dev/vmfex_vnic.py
+++ b/vdsm_hooks/vmfex_dev/vmfex_vnic.py
@@ -33,7 +33,7 @@
 import traceback
 
 from vdsm import libvirtconnection
-import hooking
+from vdsm import hooking
 
 VMFEX_NET_POOL = 'direct-pool'
 


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

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