a57dc2c30a
The API implemented by ML2 mechanism drivers included three methods related to port binding that were called within DB transactions, but that could potentially involve communication with controllers or devices that should not be done within transactions. A subsequent patch will move the calls to bind_port() outside of tranactions. This patch eliminates the other two methods from the MechanismDriver API. The validate_port_binding() method was previously called on the bound mechanism driver to check whether an existing binding was still valid, so that the port could be rebound if something changed. But since nova has no way to handle changes to binding:vif_type or binding:vif_details after a port is initially plugged, this turned out not to be useful, so the method has been removed from the MechanismDriver API. Now, once a port is successfully bound, the binding remains until the port is deleted or any of it's binding:host_id, binding:vnic_type, or binding:profile attribute values are changed. The unbind_port() method was previously called on the bound mechanism driver as an existing binding was removed. This method was not used by any existing mechanism drivers, and was redundant with the update_port_precommit() and update_port_postcommit() methods that are called on all mechanism drivers when an existing binding is removed, so this method has also been removed from the driver API. Eliminating the unbind_port() call allows the binding details to be made available via the PortContext in delete_port_postcommit() calls, completing the resolution of bug 1276395. Closes-bug: 1276395 Partial-bug: 1276391 Change-Id: I70fb65b478373c4f07f5273baa097fc50e5ba2ef
219 lines
7.3 KiB
Python
219 lines
7.3 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from neutron.extensions import portbindings
|
|
from neutron.plugins.ml2 import driver_api as api
|
|
from neutron.tests import base
|
|
|
|
NETWORK_ID = "fake_network"
|
|
PORT_ID = "fake_port"
|
|
|
|
|
|
class FakeNetworkContext(api.NetworkContext):
|
|
def __init__(self, segments):
|
|
self._network_segments = segments
|
|
|
|
@property
|
|
def current(self):
|
|
return {'id': NETWORK_ID}
|
|
|
|
@property
|
|
def original(self):
|
|
return None
|
|
|
|
@property
|
|
def network_segments(self):
|
|
return self._network_segments
|
|
|
|
|
|
class FakePortContext(api.PortContext):
|
|
def __init__(self, agent_type, agents, segments,
|
|
vnic_type=portbindings.VNIC_NORMAL):
|
|
self._agent_type = agent_type
|
|
self._agents = agents
|
|
self._network_context = FakeNetworkContext(segments)
|
|
self._bound_vnic_type = vnic_type
|
|
self._bound_segment_id = None
|
|
self._bound_vif_type = None
|
|
self._bound_vif_details = None
|
|
|
|
@property
|
|
def current(self):
|
|
return {'id': PORT_ID,
|
|
'binding:vnic_type': self._bound_vnic_type}
|
|
|
|
@property
|
|
def original(self):
|
|
return None
|
|
|
|
@property
|
|
def network(self):
|
|
return self._network_context
|
|
|
|
@property
|
|
def bound_segment(self):
|
|
if self._bound_segment_id:
|
|
for segment in self._network_context.network_segments:
|
|
if segment[api.ID] == self._bound_segment_id:
|
|
return segment
|
|
|
|
@property
|
|
def original_bound_segment(self):
|
|
return None
|
|
|
|
@property
|
|
def bound_driver(self):
|
|
return None
|
|
|
|
@property
|
|
def original_bound_driver(self):
|
|
return None
|
|
|
|
def host_agents(self, agent_type):
|
|
if agent_type == self._agent_type:
|
|
return self._agents
|
|
else:
|
|
return []
|
|
|
|
def set_binding(self, segment_id, vif_type, vif_details):
|
|
self._bound_segment_id = segment_id
|
|
self._bound_vif_type = vif_type
|
|
self._bound_vif_details = vif_details
|
|
|
|
|
|
class AgentMechanismBaseTestCase(base.BaseTestCase):
|
|
# These following must be overriden for the specific mechanism
|
|
# driver being tested:
|
|
VIF_TYPE = None
|
|
CAP_PORT_FILTER = None
|
|
AGENT_TYPE = None
|
|
AGENTS = None
|
|
AGENTS_DEAD = None
|
|
AGENTS_BAD = None
|
|
|
|
def _check_unbound(self, context):
|
|
self.assertIsNone(context._bound_segment_id)
|
|
self.assertIsNone(context._bound_vif_type)
|
|
self.assertIsNone(context._bound_vif_details)
|
|
|
|
def _check_bound(self, context, segment):
|
|
self.assertEqual(context._bound_segment_id, segment[api.ID])
|
|
self.assertEqual(context._bound_vif_type, self.VIF_TYPE)
|
|
vif_details = context._bound_vif_details
|
|
self.assertIsNotNone(vif_details)
|
|
self.assertEqual(vif_details[portbindings.CAP_PORT_FILTER],
|
|
self.CAP_PORT_FILTER)
|
|
|
|
|
|
class AgentMechanismGenericTestCase(AgentMechanismBaseTestCase):
|
|
UNKNOWN_TYPE_SEGMENTS = [{api.ID: 'unknown_segment_id',
|
|
api.NETWORK_TYPE: 'no_such_type'}]
|
|
|
|
def test_unknown_type(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS,
|
|
self.UNKNOWN_TYPE_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_unbound(context)
|
|
|
|
|
|
class AgentMechanismLocalTestCase(AgentMechanismBaseTestCase):
|
|
LOCAL_SEGMENTS = [{api.ID: 'unknown_segment_id',
|
|
api.NETWORK_TYPE: 'no_such_type'},
|
|
{api.ID: 'local_segment_id',
|
|
api.NETWORK_TYPE: 'local'}]
|
|
|
|
def test_type_local(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS,
|
|
self.LOCAL_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_bound(context, self.LOCAL_SEGMENTS[1])
|
|
|
|
def test_type_local_dead(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS_DEAD,
|
|
self.LOCAL_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_unbound(context)
|
|
|
|
|
|
class AgentMechanismFlatTestCase(AgentMechanismBaseTestCase):
|
|
FLAT_SEGMENTS = [{api.ID: 'unknown_segment_id',
|
|
api.NETWORK_TYPE: 'no_such_type'},
|
|
{api.ID: 'flat_segment_id',
|
|
api.NETWORK_TYPE: 'flat',
|
|
api.PHYSICAL_NETWORK: 'fake_physical_network'}]
|
|
|
|
def test_type_flat(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS,
|
|
self.FLAT_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_bound(context, self.FLAT_SEGMENTS[1])
|
|
|
|
def test_type_flat_bad(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS_BAD,
|
|
self.FLAT_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_unbound(context)
|
|
|
|
|
|
class AgentMechanismVlanTestCase(AgentMechanismBaseTestCase):
|
|
VLAN_SEGMENTS = [{api.ID: 'unknown_segment_id',
|
|
api.NETWORK_TYPE: 'no_such_type'},
|
|
{api.ID: 'vlan_segment_id',
|
|
api.NETWORK_TYPE: 'vlan',
|
|
api.PHYSICAL_NETWORK: 'fake_physical_network',
|
|
api.SEGMENTATION_ID: 1234}]
|
|
|
|
def test_type_vlan(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS,
|
|
self.VLAN_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_bound(context, self.VLAN_SEGMENTS[1])
|
|
|
|
def test_type_vlan_bad(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS_BAD,
|
|
self.VLAN_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_unbound(context)
|
|
|
|
|
|
class AgentMechanismGreTestCase(AgentMechanismBaseTestCase):
|
|
GRE_SEGMENTS = [{api.ID: 'unknown_segment_id',
|
|
api.NETWORK_TYPE: 'no_such_type'},
|
|
{api.ID: 'gre_segment_id',
|
|
api.NETWORK_TYPE: 'gre',
|
|
api.SEGMENTATION_ID: 1234}]
|
|
|
|
def test_type_gre(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS,
|
|
self.GRE_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_bound(context, self.GRE_SEGMENTS[1])
|
|
|
|
def test_type_gre_bad(self):
|
|
context = FakePortContext(self.AGENT_TYPE,
|
|
self.AGENTS_BAD,
|
|
self.GRE_SEGMENTS)
|
|
self.driver.bind_port(context)
|
|
self._check_unbound(context)
|