openstack
/
neutron
Code Issues Proposed changes

Merge "of_native: Use int for comparing datapath ID" into stable/pike

This commit is contained in:
Jenkins 2017-10-14 00:41:20 +00:00 committed by Gerrit Code Review
parent 7db7338453 fc827a3a61
commit 8255dce02a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py
View File

@ -55,17 +55,16 @@ class OVSAgentBridge(ofswitch.OpenFlowSwitchMixin,
# NOTE(yamamoto): Open vSwitch change its dpid on # NOTE(yamamoto): Open vSwitch change its dpid on
# some events. # some events.
# REVISIT(yamamoto): Consider to set dpid statically. # REVISIT(yamamoto): Consider to set dpid statically.
old_dpid_str = format(self._cached_dpid, '0x') new_dpid = int(self.get_datapath_id(), 16)
new_dpid_str = self.get_datapath_id() if new_dpid != self._cached_dpid:
if new_dpid_str != old_dpid_str:
LOG.info("Bridge %(br_name)s changed its " LOG.info("Bridge %(br_name)s changed its "
"datapath-ID from %(old)s to %(new)s", { "datapath-ID from %(old)x to %(new)x", {
"br_name": self.br_name, "br_name": self.br_name,
"old": old_dpid_str, "old": self._cached_dpid,
"new": new_dpid_str, "new": new_dpid,
}) })
ctx.reraise = False ctx.reraise = False
self._cached_dpid = int(new_dpid_str, 16) self._cached_dpid = new_dpid
def setup_controllers(self, conf): def setup_controllers(self, conf):
controllers = [ controllers = [

6
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_ovs_bridge.py
View File

@ -18,18 +18,20 @@ import mock
from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \ from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
import ovs_test_base import ovs_test_base
DPID = "0003e9"
class OVSAgentBridgeTestCase(ovs_test_base.OVSRyuTestBase): class OVSAgentBridgeTestCase(ovs_test_base.OVSRyuTestBase):
def test__get_dp(self): def test__get_dp(self):
mock.patch( mock.patch(
'neutron.agent.common.ovs_lib.OVSBridge.get_datapath_id', 'neutron.agent.common.ovs_lib.OVSBridge.get_datapath_id',
return_value="3e9").start() return_value=DPID).start()
mock.patch( mock.patch(
"neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native." "neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native."
"ofswitch.OpenFlowSwitchMixin._get_dp_by_dpid", "ofswitch.OpenFlowSwitchMixin._get_dp_by_dpid",
side_effect=RuntimeError).start() side_effect=RuntimeError).start()
br = self.br_int_cls('br-int') br = self.br_int_cls('br-int')
br._cached_dpid = int("3e9", 16) br._cached_dpid = int(DPID, 16)
# make sure it correctly raises RuntimeError, not UnboundLocalError as # make sure it correctly raises RuntimeError, not UnboundLocalError as
# in LP https://bugs.launchpad.net/neutron/+bug/1588042 # in LP https://bugs.launchpad.net/neutron/+bug/1588042
self.assertRaises(RuntimeError, br._get_dp) self.assertRaises(RuntimeError, br._get_dp)