Mike Kolesnik has uploaded a new change for review. Change subject: hooks: Extract devName function for openstacknet ...................................................................... hooks: Extract devName function for openstacknet Extracted function to calculate the device name used for OpenStack Networking devices. Change-Id: I8ece3bb16ac5b9bb8b28c26f2e96d2d74defd4dc Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com&gt; --- M vdsm_hooks/openstacknet/after_device_create.py M vdsm_hooks/openstacknet/before_device_create.py M vdsm_hooks/openstacknet/openstacknet_utils.py 3 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/22584/1 diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py index bdd1c22..ce1210d 100755 --- a/vdsm_hooks/openstacknet/after_device_create.py +++ b/vdsm_hooks/openstacknet/after_device_create.py @@ -26,20 +26,19 @@ import traceback import hooking -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 openstacknet_utils import devName from openstacknet_utils import executeOrExit from vdsm.constants import EXT_BRCTL def disconnectVnic(portId): - tapName = ('tap' + portId)[:DEV_MAX_LENGTH] - executeOrExit([EXT_BRCTL, 'delif', DUMMY_BRIDGE, tapName]) + executeOrExit([EXT_BRCTL, 'delif', DUMMY_BRIDGE, devName('tap', portId)]) def main(): diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py index 20cd9f7..09c7a19 100755 --- a/vdsm_hooks/openstacknet/before_device_create.py +++ b/vdsm_hooks/openstacknet/before_device_create.py @@ -28,7 +28,6 @@ from xml.dom import minidom import hooking -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 @@ -36,6 +35,7 @@ from openstacknet_utils import PT_BRIDGE from openstacknet_utils import PT_OVS from openstacknet_utils import VNIC_ID_KEY +from openstacknet_utils import devName HELP_ARG = "-h" TEST_ARG = "-t" @@ -57,8 +57,7 @@ def addLinuxBridgeVnic(domxml, iface, portId): target = domxml.createElement('target') - tapName = ('tap' + portId)[:DEV_MAX_LENGTH] - target.setAttribute('dev', tapName) + target.setAttribute('dev', devName('tap', portId)) iface.appendChild(target) source = iface.getElementsByTagName('source')[0] diff --git a/vdsm_hooks/openstacknet/openstacknet_utils.py b/vdsm_hooks/openstacknet/openstacknet_utils.py index 36f6e0f..a00d7ee 100644 --- a/vdsm_hooks/openstacknet/openstacknet_utils.py +++ b/vdsm_hooks/openstacknet/openstacknet_utils.py @@ -24,3 +24,7 @@ if commandFailed: hooking.exit_hook("Failed to execute %s, due to: %s" % (str(command), err)) + + +def devName(prefix, name): + return (prefix + str(name))[:DEV_MAX_LENGTH] -- To view, visit http://gerrit.ovirt.org/22584 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ece3bb16ac5b9bb8b28c26f2e96d2d74defd4dc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com&gt;