From: armando-migliaccio <armamig@gmail.com>
Date: Thu, 16 Apr 2015 01:20:51 +0000 (-0700)
Subject: Drop the ovs_lib compat layer as per TODO note
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3bbf473b49457c4afbfc23fd9f59be8aa08a257d;p=openstack-build%2Fneutron-build.git

Drop the ovs_lib compat layer as per TODO note

Breakage documented in [1]

[1] https://wiki.openstack.org/wiki/Neutron/LibraryAPIBreakage

Change-Id: I41820faf8ef7fd00cf864da6f1a63ccb79c25fd8
---

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
deleted file mode 100644
index 04e93d43f..000000000
--- a/neutron/agent/linux/ovs_lib.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2015 Cloudbase Solutions.
-# 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.
-
-# This is a placeholder so that the vendor code that import the ovs_lib
-# module from agent/linux doesn't fail
-# TODO(atuvenie) remove this module after opening the liberty cycle
-
-from neutron.agent.common import ovs_lib
-
-INVALID_OFPORT = ovs_lib.INVALID_OFPORT
-BaseOVS = ovs_lib.BaseOVS
-OVSBridge = ovs_lib.OVSBridge
-DeferredOVSBridge = ovs_lib.DeferredOVSBridge
-VifPort = ovs_lib.VifPort
-_build_flow_expr_str = ovs_lib._build_flow_expr_str