Added networking-sfc from openstack project with merge date Dec 23 2015stable/coloradostable/brahmaputra

Added patch 13 for subject "add missing db migration files"

Change-Id: Id51a160335a14870c1dd816a44baf9b1958b9ac6

1 files changed, 48 insertions, 0 deletions

diff --git a/networking_sfc/services/sfc/agent/br_int.py b/networking_sfc/services/sfc/agent/br_int.py
new file mode 100644
index 0000000..1f88c01
--- /dev/null
+++ b/networking_sfc/services/sfc/agent/br_int.py
@@ -0,0 +1,48 @@
+# Copyright 2015 Huawei.  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.
+
+"""
+* references
+** OVS agent https://wiki.openstack.org/wiki/Ovs-flow-logic
+"""
+
+from networking_sfc.services.sfc.common import ovs_ext_lib
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl import (
+    br_int)
+
+
+class OVSIntegrationBridge(
+    br_int.OVSIntegrationBridge,
+    ovs_ext_lib.OVSBridgeExt
+):
+    def setup_controllers(self, conf):
+        self.set_protocols("[]")
+        self.del_controller()
+
+    def delete_arp_spoofing_protection(self, port):
+        # there is an issue to delete icmp6, it will not effect and cause
+        # other flow rule get deleted.
+        # Raofei will raise a bug to neutron community.
+        self.delete_flows(table_id=constants.LOCAL_SWITCHING,
+                          in_port=port, proto='arp')
+        self.delete_flows(table_id=constants.ARP_SPOOF_TABLE,
+                          in_port=port)
+
+    def mod_flow(self, **kwargs):
+        ovs_ext_lib.OVSBridgeExt.mod_flow(self, **kwargs)
+
+    def run_ofctl(self, cmd, args, process_input=None):
+        return ovs_ext_lib.OVSBridgeExt.run_ofctl(
+            self, cmd, args, process_input=process_input)