openstack
/
neutron
Code Issues Proposed changes

Fix get_free_namespace_port to actually avoid used ports 

ss output is a string.  It needs to be converted to int before a set
operation.  The function seems to have been broken from the beginning
(commit e3fa0112).

Change-Id: I0d10360ae8807b3688d36912b42fa2a140c45e04
Closes-Bug: #1551288
This commit is contained in:
IWAMOTO Toshihiro 2016-06-01 20:17:34 +09:00
parent 8ae7436da9
commit 9319b1a836
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/common/net_helpers.py
View File

@ -155,7 +155,7 @@ def _get_source_ports_from_ss_output(output):
for line in output.splitlines():
match = SS_SOURCE_PORT_PATTERN.match(line)
if match:
ports.add(match.group('port'))
ports.add(int(match.group('port')))
return ports

25
neutron/tests/unit/tests/common/test_net_helpers.py
View File

@ -12,6 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from neutron.common import constants as n_const
from neutron.tests import base
from neutron.tests.common import net_helpers
@ -35,10 +38,28 @@ LISTEN 0 128 :::5672 :::*
ESTAB 0 0 ::ffff:127.0.0.1:4369 ::ffff:127.0.0.1:32965
"""
ss_output_template = """
LISTEN 0 10 127.0.0.1:%d *:*
"""
class PortAllocationTestCase(base.DietTestCase):
def test__get_source_ports_from_ss_output(self):
result = net_helpers._get_source_ports_from_ss_output(ss_output)
expected = {'6640', '46675', '5432', '3260', '3306', '22', '32965',
'4369', '5672', '80'}
expected = {6640, 46675, 5432, 3260, 3306, 22, 32965,
4369, 5672, 80}
self.assertEqual(expected, result)
def test_get_free_namespace_port(self):
ss_output2 = ss_output
for p in range(1024, 65535):
ss_output2 += ss_output_template % p
with mock.patch('neutron.agent.linux.ip_lib.IPWrapper') \
as ipwrapper:
m = mock.MagicMock()
m.netns.execute.return_value = ss_output2
ipwrapper.return_value = m
result = net_helpers.get_free_namespace_port(
n_const.PROTO_NAME_TCP)
self.assertEqual(65535, result)