diff --git a/nova/console/serial.py b/nova/console/serial.py index 98ac3f85fe53..af3abe080184 100644 --- a/nova/console/serial.py +++ b/nova/console/serial.py @@ -67,14 +67,13 @@ def release_port(host, port): def _get_port_range(): config_range = CONF.serial_console.port_range - try: - start, stop = map(int, config_range.split(':')) - if start >= stop: - raise ValueError - except ValueError: + + start, stop = map(int, config_range.split(':')) + if start >= stop: default_port_range = nova.conf.serial_console.DEFAULT_PORT_RANGE - LOG.warning(_LW("serial_console.port_range should be :. " - "Given value %(port_range)s could not be parsed. " + LOG.warning(_LW("serial_console.port_range should be in the " + "format : and start < stop, " + "Given value %(port_range)s is invalid. " "Taking the default port range %(default)s."), {'port_range': config_range, 'default': default_port_range}) diff --git a/nova/tests/unit/console/test_serial.py b/nova/tests/unit/console/test_serial.py index d910f0256379..7aeb0703e788 100644 --- a/nova/tests/unit/console/test_serial.py +++ b/nova/tests/unit/console/test_serial.py @@ -46,18 +46,6 @@ class SerialTestCase(test.NoDBTestCase): self.assertEqual(10000, start) self.assertEqual(20000, stop) - def test_get_port_range_not_numeric(self): - self.flags(port_range='xxx:yyy', group='serial_console') - start, stop = serial._get_port_range() - self.assertEqual(10000, start) - self.assertEqual(20000, stop) - - def test_get_port_range_invalid_syntax(self): - self.flags(port_range='10:20:30', group='serial_console') - start, stop = serial._get_port_range() - self.assertEqual(10000, start) - self.assertEqual(20000, stop) - @mock.patch('socket.socket') def test_verify_port(self, fake_socket): s = mock.MagicMock()