openstack/neutron
Code Issues Proposed changes

Merge "Kill _connection_to_manager_uri dummy"

Browse Source
This commit is contained in:
Zuul 2018-02-22 00:30:23 +00:00 committed by Gerrit Code Review
commit 4a13ada48f
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/ovsdb/native/helpers.py
View File

@ -14,15 +14,10 @@
import functools import functools
from debtcollector import moves
from ovsdbapp.schema.open_vswitch import helpers from ovsdbapp.schema.open_vswitch import helpers
from neutron.agent.common import utils 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( enable_connection_uri = functools.partial(
helpers.enable_connection_uri, execute=utils.execute, run_as_root=True, helpers.enable_connection_uri, execute=utils.execute, run_as_root=True,
log_fail_as_error=False, check_exit_code=False) log_fail_as_error=False, check_exit_code=False)

36
neutron/tests/unit/agent/ovsdb/native/test_helpers.py
View File

@ -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))