use plugin utils from neutron-lib
The remainder of the neutron.plugins.common.utils were rehomed into neutron-lib with [1][2]. This patch consumes them by using the functions from neutron-lib, and removing the neutron.plugins.common.utils module all together as it's fully rehomed now. NeutronLibImpact [1] https://review.openstack.org/#/c/560950/ [2] https://review.openstack.org/#/c/554546/ Change-Id: Ic0f7b37861f078ce8c5ee92d97e977b8d2b468adchanges/84/565284/4
Boden R
5 years ago
parent
be4a1dd6dd
commit
839e575fa6
@ -1,76 +0,0 @@
|
||||
# Copyright 2013 Cisco Systems, 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.
|
||||
|
||||
"""
|
||||
Common utilities and helper functions for OpenStack Networking Plugins.
|
||||
These utils are private and for neutron internal use only.
|
||||
"""
|
||||
|
||||
from neutron_lib.api import attributes as lib_attrs
|
||||
from neutron_lib.api.definitions import network as net_def
|
||||
from neutron_lib.api.definitions import port as port_def
|
||||
from neutron_lib.api.definitions import subnet as subnet_def
|
||||
from oslo_config import cfg
|
||||
import webob.exc
|
||||
|
||||
|
||||
# TODO(boden): remove when consuming I2c0e4ef03425ba0bb2651ae3e68d6c8cde7b8f90
|
||||
|
||||
def _fixup_res_dict(context, attr_name, res_dict, check_allow_post=True):
|
||||
attr_info = lib_attrs.RESOURCES[attr_name]
|
||||
attr_ops = lib_attrs.AttributeInfo(attr_info)
|
||||
try:
|
||||
attr_ops.populate_project_id(context, res_dict, True)
|
||||
lib_attrs.populate_project_info(attr_info)
|
||||
attr_ops.verify_attributes(res_dict)
|
||||
except webob.exc.HTTPBadRequest as e:
|
||||
# convert webob exception into ValueError as these functions are
|
||||
# for internal use. webob exception doesn't make sense.
|
||||
raise ValueError(e.detail)
|
||||
attr_ops.fill_post_defaults(res_dict, check_allow_post=check_allow_post)
|
||||
attr_ops.convert_values(res_dict)
|
||||
return res_dict
|
||||
|
||||
|
||||
def create_network(core_plugin, context, net, check_allow_post=True):
|
||||
net_data = _fixup_res_dict(context, net_def.COLLECTION_NAME,
|
||||
net.get('network', {}),
|
||||
check_allow_post=check_allow_post)
|
||||
return core_plugin.create_network(context, {'network': net_data})
|
||||
|
||||
|
||||
def create_subnet(core_plugin, context, subnet, check_allow_post=True):
|
||||
subnet_data = _fixup_res_dict(context, subnet_def.COLLECTION_NAME,
|
||||
subnet.get('subnet', {}),
|
||||
check_allow_post=check_allow_post)
|
||||
return core_plugin.create_subnet(context, {'subnet': subnet_data})
|
||||
|
||||
|
||||
def create_port(core_plugin, context, port, check_allow_post=True):
|
||||
port_data = _fixup_res_dict(context, port_def.COLLECTION_NAME,
|
||||
port.get('port', {}),
|
||||
check_allow_post=check_allow_post)
|
||||
return core_plugin.create_port(context, {'port': port_data})
|
||||
|
||||
|
||||
# TODO(boden): consume with I73f5e8ad7a1a83392094db846d18964d811b8bb2
|
||||
def get_deployment_physnet_mtu():
|
||||
"""Retrieves global physical network MTU setting.
|
||||
|
||||
Plugins should use this function to retrieve the MTU set by the operator
|
||||
that is equal to or less than the MTU of their nodes' physical interfaces.
|
||||
Note that it is the responsibility of the plugin to deduct the value of
|
||||
any encapsulation overhead required before advertising it to VMs.
|
||||
"""
|
||||
return cfg.CONF.global_physnet_mtu
|
||||
@ -1,117 +0,0 @@
|
||||
# Copyright (c) 2015 IBM Corp.
|
||||
#
|
||||
# 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 hashlib
|
||||
|
||||
import mock
|
||||
from neutron_lib import constants
|
||||
from neutron_lib import exceptions
|
||||
from neutron_lib.plugins import utils
|
||||
import testtools
|
||||
|
||||
from neutron.db import l3_db
|
||||
from neutron.tests import base
|
||||
|
||||
LONG_NAME1 = "A_REALLY_LONG_INTERFACE_NAME1"
|
||||
LONG_NAME2 = "A_REALLY_LONG_INTERFACE_NAME2"
|
||||
SHORT_NAME = "SHORT"
|
||||
MOCKED_HASH = "mockedhash"
|
||||
|
||||
|
||||
class MockSHA(object):
|
||||
def hexdigest(self):
|
||||
return MOCKED_HASH
|
||||
|
||||
|
||||
class TestUtils(base.BaseTestCase):
|
||||
|
||||
@mock.patch.object(hashlib, 'sha1', return_value=MockSHA())
|
||||
def test_get_interface_name(self, mock_sha1):
|
||||
prefix = "pre-"
|
||||
prefix_long = "long_prefix"
|
||||
prefix_exceeds_max_dev_len = "much_too_long_prefix"
|
||||
hash_used = MOCKED_HASH[0:6]
|
||||
|
||||
self.assertEqual("A_REALLY_" + hash_used,
|
||||
utils.get_interface_name(LONG_NAME1))
|
||||
self.assertEqual("SHORT",
|
||||
utils.get_interface_name(SHORT_NAME))
|
||||
self.assertEqual("pre-A_REA" + hash_used,
|
||||
utils.get_interface_name(LONG_NAME1, prefix=prefix))
|
||||
self.assertEqual("pre-SHORT",
|
||||
utils.get_interface_name(SHORT_NAME, prefix=prefix))
|
||||
# len(prefix) > max_device_len - len(hash_used)
|
||||
self.assertRaises(ValueError, utils.get_interface_name, SHORT_NAME,
|
||||
prefix_long)
|
||||
# len(prefix) > max_device_len
|
||||
self.assertRaises(ValueError, utils.get_interface_name, SHORT_NAME,
|
||||
prefix=prefix_exceeds_max_dev_len)
|
||||
|
||||
def test_get_interface_uniqueness(self):
|
||||
prefix = "prefix-"
|
||||
if_prefix1 = utils.get_interface_name(LONG_NAME1, prefix=prefix)
|
||||
if_prefix2 = utils.get_interface_name(LONG_NAME2, prefix=prefix)
|
||||
self.assertNotEqual(if_prefix1, if_prefix2)
|
||||
|
||||
@mock.patch.object(hashlib, 'sha1', return_value=MockSHA())
|
||||
def test_get_interface_max_len(self, mock_sha1):
|
||||
self.assertEqual(constants.DEVICE_NAME_MAX_LEN,
|
||||
len(utils.get_interface_name(LONG_NAME1)))
|
||||
self.assertEqual(10, len(utils.get_interface_name(LONG_NAME1,
|
||||
max_len=10)))
|
||||
self.assertEqual(12, len(utils.get_interface_name(LONG_NAME1,
|
||||
prefix="pre-",
|
||||
max_len=12)))
|
||||
|
||||
def test_delete_port_on_error(self):
|
||||
core_plugin, context = mock.Mock(), mock.Mock()
|
||||
port_id = 'pid'
|
||||
with testtools.ExpectedException(ValueError):
|
||||
with utils.delete_port_on_error(core_plugin, context, port_id):
|
||||
raise ValueError()
|
||||
core_plugin.delete_port.assert_called_once_with(context, port_id,
|
||||
l3_port_check=False)
|
||||
|
||||
def test_delete_port_on_error_fail_port_delete(self):
|
||||
core_plugin, context = mock.Mock(), mock.Mock()
|
||||
core_plugin.delete_port.side_effect = TypeError()
|
||||
port_id = 'pid'
|
||||
with testtools.ExpectedException(ValueError):
|
||||
with utils.delete_port_on_error(core_plugin, context, port_id):
|
||||
raise ValueError()
|
||||
core_plugin.delete_port.assert_called_once_with(context, port_id,
|
||||
l3_port_check=False)
|
||||
|
||||
def test_delete_port_on_error_port_does_not_exist(self):
|
||||
core_plugin, context = mock.Mock(), mock.Mock()
|
||||
port_id = 'pid'
|
||||
core_plugin.delete_port.side_effect = exceptions.PortNotFound(
|
||||
port_id=port_id)
|
||||
with testtools.ExpectedException(exceptions.PortNotFound):
|
||||
with utils.delete_port_on_error(core_plugin, context, port_id):
|
||||
raise exceptions.PortNotFound(port_id=port_id)
|
||||
core_plugin.delete_port.assert_called_once_with(context, port_id,
|
||||
l3_port_check=False)
|
||||
|
||||
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_check_router_port')
|
||||
def test_update_port_on_error(self, mock_check):
|
||||
core_plugin, context = mock.Mock(), mock.Mock()
|
||||
port = mock_check.return_value = {'device_owner': 'xxxxxxxx'}
|
||||
revert_value = {'device_id': '', 'device_owner': port['device_owner']}
|
||||
with testtools.ExpectedException(ValueError):
|
||||
with utils.update_port_on_error(core_plugin,
|
||||
context, 1, revert_value):
|
||||
raise ValueError()
|
||||
core_plugin.update_port.assert_called_once_with(
|
||||
context, 1, {'port': revert_value})
|
||||
Loading…
Reference in New Issue