From 9adc57e57fb16926519b92fc167b07f901b088db Mon Sep 17 00:00:00 2001 From: zhiyuan_cai Date: Mon, 25 Jul 2016 09:53:55 +0800 Subject: [PATCH] Fix issue from _add_network_segment in Neutron 1. What is the problem The Tricircle Neutron plugin will call Neutron type manager's function _add_network_segement, but Neutron has removed the "mtu" parameter recently, this makes the check and gate test in the Tricircle failed because the Tricircle still passes the "mtu" parameter. All check and gate test of python27 failed due to this change, and any new patch is not able to be merged. The issue should be fixed ASAP. 2. What's needed to be fixed: Do not pass "mtu" to the function _add_network_segement. 3. What is the purpose of this patch set: To get rid of the failure in check and gate test failure. Change-Id: Id51cc9840e4bf2dd8e01b504502266e962c1e0c9 --- tricircle/network/managers.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tricircle/network/managers.py b/tricircle/network/managers.py index b5cbf0e..afbe447 100644 --- a/tricircle/network/managers.py +++ b/tricircle/network/managers.py @@ -82,7 +82,6 @@ class TricircleTypeManager(managers.TypeManager): return segments = self._process_provider_create(network) session = context.session - mtu = [] with session.begin(subtransactions=True): network_id = network['id'] if segments: @@ -90,10 +89,10 @@ class TricircleTypeManager(managers.TypeManager): segment = self.reserve_provider_segment( session, segment) self._add_network_segment(context, network_id, segment, - mtu, segment_index) + segment_index) else: segment = self._allocate_tenant_net_segment(session) - self._add_network_segment(context, network_id, segment, mtu) + self._add_network_segment(context, network_id, segment) def extend_networks_dict_provider(self, context, networks): internal_networks = []