openstack
/
neutron
Code Issues Proposed changes

Merge "Python 3: specify a bytes to an argument for a format type 's' of struct.pack()"

This commit is contained in:
Jenkins 2015-08-13 08:10:40 +00:00 committed by Gerrit Code Review
parent 44b2226174 9744ef78e6
commit 711806cdb6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/agent/linux/utils.py
View File

@ -33,6 +33,7 @@ from oslo_log import log as logging
from oslo_log import loggers
from oslo_rootwrap import client
from oslo_utils import excutils
import six
from six.moves import http_client as httplib
from neutron.agent.common import config
@ -149,8 +150,10 @@ def get_interface_mac(interface):
MAC_START = 18
MAC_END = 24
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
info = fcntl.ioctl(s.fileno(), 0x8927,
struct.pack('256s', interface[:constants.DEVICE_NAME_MAX_LEN]))
dev = interface[:constants.DEVICE_NAME_MAX_LEN]
if isinstance(dev, six.text_type):
dev = dev.encode('utf-8')
info = fcntl.ioctl(s.fileno(), 0x8927, struct.pack('256s', dev))
return ''.join(['%02x:' % ord(char)
for char in info[MAC_START:MAC_END]])[:-1]

1
tox.ini
View File

@ -212,6 +212,7 @@ commands = python -m testtools.run \
neutron.tests.unit.agent.linux.test_bridge_lib \
neutron.tests.unit.agent.linux.test_ip_link_support \
neutron.tests.unit.agent.linux.test_interface \
neutron.tests.unit.agent.linux.test_utils \
neutron.tests.unit.agent.dhcp.test_agent \
neutron.tests.unit.test_manager \
neutron.tests.unit.test_service \