From cf3b7807a003cdbf18167a2846163647c6bb158c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 31 Jan 2018 07:01:32 -0800 Subject: [PATCH] Kill _connection_to_manager_uri dummy The dummy proxies to ovsdbapp, is for an explicitly internal function (name starts with underscore), it issued a warning since Pike, and the only place it was used was a unit test that just calls it and checks result. Change-Id: I9dcd4aaa095a02200ac5670ed945995295837e66 --- neutron/agent/ovsdb/native/helpers.py | 5 --- .../unit/agent/ovsdb/native/test_helpers.py | 36 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 neutron/tests/unit/agent/ovsdb/native/test_helpers.py diff --git a/neutron/agent/ovsdb/native/helpers.py b/neutron/agent/ovsdb/native/helpers.py index b0a9d5b6175..47c37ca67f3 100644 --- a/neutron/agent/ovsdb/native/helpers.py +++ b/neutron/agent/ovsdb/native/helpers.py @@ -14,15 +14,10 @@ import functools -from debtcollector import moves from ovsdbapp.schema.open_vswitch import helpers from neutron.agent.common import utils -_connection_to_manager_uri = moves.moved_function( - helpers._connection_to_manager_uri, - '_connection_to_manager_uri', __name__) - enable_connection_uri = functools.partial( helpers.enable_connection_uri, execute=utils.execute, run_as_root=True, log_fail_as_error=False, check_exit_code=False) diff --git a/neutron/tests/unit/agent/ovsdb/native/test_helpers.py b/neutron/tests/unit/agent/ovsdb/native/test_helpers.py deleted file mode 100644 index c6b537dc02d..00000000000 --- a/neutron/tests/unit/agent/ovsdb/native/test_helpers.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2015, Red Hat, Inc. -# -# 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. - -import mock - -from neutron.agent.ovsdb.native import helpers -from neutron.tests import base - - -CONNECTION_TO_MANAGER_URI_MAP = ( - ('unix:/path/to/file', 'punix:/path/to/file'), - ('tcp:127.0.0.1:6640', 'ptcp:6640:127.0.0.1'), - ('ssl:192.168.1.1:8080', 'pssl:8080:192.168.1.1')) - - -class TestOVSNativeHelpers(base.BaseTestCase): - - def setUp(self): - super(TestOVSNativeHelpers, self).setUp() - self.execute = mock.patch('neutron.agent.common.utils.execute').start() - - def test__connection_to_manager_uri(self): - for conn_uri, expected in CONNECTION_TO_MANAGER_URI_MAP: - self.assertEqual(expected, - helpers._connection_to_manager_uri(conn_uri))