Mike Kolesnik has uploaded a new change for review. Change subject: hooks: Renamed openstacknet_consts file ...................................................................... hooks: Renamed openstacknet_consts file In order to put functions in the shared file, it is more appropriate to name it openstacknet_utils rather than openstacknet_consts. Change-Id: I5cf8c6ce2463e89e88b761f25801a2dcfc8a083c Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com&gt; --- M debian/vdsm-hook-openstacknet.install M vdsm.spec.in M vdsm_hooks/openstacknet/Makefile.am M vdsm_hooks/openstacknet/after_device_create.py M vdsm_hooks/openstacknet/before_device_create.py R vdsm_hooks/openstacknet/openstacknet_utils.py 6 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/22582/1 diff --git a/debian/vdsm-hook-openstacknet.install b/debian/vdsm-hook-openstacknet.install index a23dce8..b13a151 100644 --- a/debian/vdsm-hook-openstacknet.install +++ b/debian/vdsm-hook-openstacknet.install @@ -1,11 +1,11 @@ etc/sudoers.d/50_vdsm_hook_openstacknet usr/libexec/vdsm/hooks/after_device_create/50_openstacknet -usr/libexec/vdsm/hooks/after_device_create/openstacknet_consts.py +usr/libexec/vdsm/hooks/after_device_create/openstacknet_utils.py usr/libexec/vdsm/hooks/after_device_migrate_destination/50_openstacknet -usr/libexec/vdsm/hooks/after_device_migrate_destination/openstacknet_consts.py +usr/libexec/vdsm/hooks/after_device_migrate_destination/openstacknet_utils.py usr/libexec/vdsm/hooks/after_nic_hotplug/50_openstacknet -usr/libexec/vdsm/hooks/after_nic_hotplug/openstacknet_consts.py +usr/libexec/vdsm/hooks/after_nic_hotplug/openstacknet_utils.py usr/libexec/vdsm/hooks/before_device_create/50_openstacknet -usr/libexec/vdsm/hooks/before_device_create/openstacknet_consts.py +usr/libexec/vdsm/hooks/before_device_create/openstacknet_utils.py usr/libexec/vdsm/hooks/before_nic_hotplug/50_openstacknet -usr/libexec/vdsm/hooks/before_nic_hotplug/openstacknet_consts.py +usr/libexec/vdsm/hooks/before_nic_hotplug/openstacknet_utils.py diff --git a/vdsm.spec.in b/vdsm.spec.in index b0ff00a..6a5e49e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1143,15 +1143,15 @@ %defattr(-, root, root, -) %{_sysconfdir}/sudoers.d/50_vdsm_hook_openstacknet %{_libexecdir}/%{vdsm_name}/hooks/after_device_create/50_openstacknet -%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_consts.py* +%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_utils.py* %{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/50_openstacknet -%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_consts.py* +%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_utils.py* %{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/50_openstacknet -%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_consts.py* +%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_utils.py* %{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_openstacknet -%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_consts.py* +%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_utils.py* %{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet -%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_consts.py* +%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py* %files hook-vhostmd %defattr(-, root, root, -) diff --git a/vdsm_hooks/openstacknet/Makefile.am b/vdsm_hooks/openstacknet/Makefile.am index c73505c..a05e821 100644 --- a/vdsm_hooks/openstacknet/Makefile.am +++ b/vdsm_hooks/openstacknet/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -constsfile=openstacknet_consts.py +constsfile=openstacknet_utils.py include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py index e90d759..be23a32 100755 --- a/vdsm_hooks/openstacknet/after_device_create.py +++ b/vdsm_hooks/openstacknet/after_device_create.py @@ -26,13 +26,13 @@ import traceback import hooking -from openstacknet_consts import DEV_MAX_LENGTH -from openstacknet_consts import DUMMY_BRIDGE -from openstacknet_consts import OPENSTACK_NET_PROVIDER_TYPE -from openstacknet_consts import PLUGIN_TYPE_KEY -from openstacknet_consts import PROVIDER_TYPE_KEY -from openstacknet_consts import PT_BRIDGE -from openstacknet_consts import VNIC_ID_KEY +from openstacknet_utils import DEV_MAX_LENGTH +from openstacknet_utils import DUMMY_BRIDGE +from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE +from openstacknet_utils import PLUGIN_TYPE_KEY +from openstacknet_utils import PROVIDER_TYPE_KEY +from openstacknet_utils import PT_BRIDGE +from openstacknet_utils import VNIC_ID_KEY from vdsm.constants import EXT_BRCTL diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py index 6a9e6d1..20cd9f7 100755 --- a/vdsm_hooks/openstacknet/before_device_create.py +++ b/vdsm_hooks/openstacknet/before_device_create.py @@ -28,14 +28,14 @@ from xml.dom import minidom import hooking -from openstacknet_consts import DEV_MAX_LENGTH -from openstacknet_consts import DUMMY_BRIDGE -from openstacknet_consts import OPENSTACK_NET_PROVIDER_TYPE -from openstacknet_consts import PLUGIN_TYPE_KEY -from openstacknet_consts import PROVIDER_TYPE_KEY -from openstacknet_consts import PT_BRIDGE -from openstacknet_consts import PT_OVS -from openstacknet_consts import VNIC_ID_KEY +from openstacknet_utils import DEV_MAX_LENGTH +from openstacknet_utils import DUMMY_BRIDGE +from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE +from openstacknet_utils import PLUGIN_TYPE_KEY +from openstacknet_utils import PROVIDER_TYPE_KEY +from openstacknet_utils import PT_BRIDGE +from openstacknet_utils import PT_OVS +from openstacknet_utils import VNIC_ID_KEY HELP_ARG = "-h" TEST_ARG = "-t" diff --git a/vdsm_hooks/openstacknet/openstacknet_consts.py b/vdsm_hooks/openstacknet/openstacknet_utils.py similarity index 100% rename from vdsm_hooks/openstacknet/openstacknet_consts.py rename to vdsm_hooks/openstacknet/openstacknet_utils.py -- To view, visit http://gerrit.ovirt.org/22582 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cf8c6ce2463e89e88b761f25801a2dcfc8a083c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com&gt;