File 0005-Don-t-uninstall-flow-tables-in-setup_dvr_f... of Package openstack-neutron

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Don-t-uninstall-flow-tables-in-setup_dvr_flows_on_in.patch of Package openstack-neutron

From f40ab07e0e885c77a86872148676f71bd1b2367a Mon Sep 17 00:00:00 2001
From: Yang JianFeng <yjf1970231893@gmail.com>
Date: Wed, 6 Jun 2018 10:55:00 +0000
Subject: [PATCH 5/5] Don't uninstall flow tables in
 setup_dvr_flows_on_integ_br

This is a revise for I7b24a159962af7b58c096a1b2766e2169e9f8aed

Br-int's flow tables are already uninstalled in setup_integration_br.
And setup_integration_br will install some default flows. If we still
uninstall flow tables of br-int in setup_dvr_flows_on_integ_br, these
default flow tables will be missing.

Closes-Bug: #1775146
Change-Id: I71c1f9034dfc913b9e9ae17cc8f6bd084c9ee580
(cherry picked from commit 760870b6c238f5f2aa5fec33852e51b4ebccb718)
---
 .../drivers/openvswitch/agent/ovs_dvr_neutron_agent.py    | 8 --------
 1 file changed, 8 deletions(-)

Index: neutron-9.4.2.dev21/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
===================================================================
--- neutron-9.4.2.dev21.orig/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
+++ neutron-9.4.2.dev21/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
@@ -17,7 +17,6 @@ import sys
 
 import netaddr
 from neutron_lib import constants as n_const
-from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging
 from oslo_utils import excutils
@@ -30,9 +29,6 @@ from neutron.plugins.ml2.drivers.openvsw
 
 LOG = logging.getLogger(__name__)
 
-cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
-                      'agent.common.config')
-
 
 # A class to represent a DVR-hosted subnet including vif_ports resident on
 # that subnet
@@ -143,7 +139,6 @@ class OVSDVRNeutronAgent(object):
         self.dvr_mac_address = None
         if self.enable_distributed_routing:
             self.get_dvr_mac_address()
-        self.conf = cfg.CONF
 
     def setup_dvr_flows(self):
         self.setup_dvr_flows_on_integ_br()
@@ -210,9 +205,6 @@ class OVSDVRNeutronAgent(object):
 
         LOG.info(_LI("L2 Agent operating in DVR Mode with MAC %s"),
                  self.dvr_mac_address)
-        # Remove existing flows in integration bridge
-        if self.conf.AGENT.drop_flows_on_start:
-            self.int_br.delete_flows()
 
         # Add a canary flow to int_br to track OVS restarts
         self.int_br.setup_canary_table()

Places

File 0005-Don-t-uninstall-flow-tables-in-setup_dvr_flows_on_in.patch of Package openstack-neutron

Places