Browse Source

Merge "Remove super old br-<uuid> neutron network id compat code"

changes/17/694717/1
Zuul 3 weeks ago
parent
commit
236d56e70c
2 changed files with 11 additions and 10 deletions
  1. +3
    -8
      nova/api/openstack/compute/servers.py
  2. +8
    -2
      nova/tests/unit/api/openstack/compute/test_serversV21.py

+ 3
- 8
nova/api/openstack/compute/servers.py View File

@@ -389,14 +389,9 @@ class ServersController(wsgi.Controller):
:raises: webob.exc.HTTPBadRequest if validation fails
"""
if not uuidutils.is_uuid_like(net_id):
# NOTE(mriedem): Neutron would allow a network id with a br- prefix
# back in Folsom so continue to honor that.
# TODO(mriedem): Need to figure out if this is still a valid case.
br_uuid = net_id.split('-', 1)[-1]
if not uuidutils.is_uuid_like(br_uuid):
msg = _("Bad networks format: network uuid is "
"not in proper format (%s)") % net_id
raise exc.HTTPBadRequest(explanation=msg)
msg = _("Bad networks format: network uuid is "
"not in proper format (%s)") % net_id
raise exc.HTTPBadRequest(explanation=msg)

# duplicate networks are allowed only for neutron v2.0
if net_id in network_uuids and not utils.is_neutron():

+ 8
- 2
nova/tests/unit/api/openstack/compute/test_serversV21.py View File

@@ -302,11 +302,17 @@ class ServersControllerTest(ControllerTest):
self.assertIsNotNone(ctxt.db_connection)

def test_requested_networks_prefix(self):
"""Tests that we no longer support the legacy br-<uuid> format for
a network id.
"""
self.flags(use_neutron=True)
uuid = 'br-00000000-0000-0000-0000-000000000000'
requested_networks = [{'uuid': uuid}]
res = self.controller._get_requested_networks(requested_networks)
self.assertIn((uuid, None, None, None), res.as_tuples())
ex = self.assertRaises(webob.exc.HTTPBadRequest,
self.controller._get_requested_networks,
requested_networks)
self.assertIn('Bad networks format: network uuid is not in proper '
'format', six.text_type(ex))

def test_requested_networks_neutronv2_enabled_with_port(self):
self.flags(use_neutron=True)

Loading…
Cancel
Save