b6d091279f
The extensions fields were not being added to the response being sent back to the user for ports and networks that weren't from ML2 extensions (e.g. availability zones). This created an inconsistent response between creates and updates/gets. It also resulted in incomplete data in the AMQP create notification emitted in the API layer. This patch adjusts ML2 to call the _apply_dict_extend_functions method after creating ports and networks. To make this work, another DB lookup to get the latest model state was necessary. However, this is part of an already expensive operation (create) so the performance impact should be minimal. This issue stems from the fact that db_base_plugin_v2 does not process extensions when its create_port, create_network methods are called. This original skipping behavior was added back in patch If0f0277191884aab4dcb1ee36826df7f7d66a8fa as a performance improvement to deal with dictionary extension functions that performed DB lookups. However, at this point the dictionary extension functions should have been optimized to skip any DB lookups to avoid the massive performance penalties they incur during list operations. An alternative to this patch was to adjust the db_base_plugin_v2 to stop skipping extensions. However, because this is usually called by inheriting plugins before they process extensions for the new port/network, the extensions do not yet have the required information to extend the dict and will fail. So each core plugin will need to apply similar logic to support extensions that rely on the extend_dict functions. Closes-Bug: #1541774 Change-Id: Iea2c0e7f9ee5eeae28b99797874ca8a8e5790ec2
136 lines
5.6 KiB
Python
136 lines
5.6 KiB
Python
#
|
|
# 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.
|
|
|
|
from neutron import context
|
|
from neutron.db import agents_db
|
|
from neutron.db import db_base_plugin_v2
|
|
from neutron.extensions import agent
|
|
from neutron.extensions import availability_zone as az_ext
|
|
from neutron.tests.common import helpers
|
|
from neutron.tests.unit.db import test_db_base_plugin_v2
|
|
|
|
|
|
class AZExtensionManager(object):
|
|
|
|
def get_resources(self):
|
|
agent.RESOURCE_ATTRIBUTE_MAP['agents'].update(
|
|
az_ext.EXTENDED_ATTRIBUTES_2_0['agents'])
|
|
return (az_ext.Availability_zone.get_resources() +
|
|
agent.Agent.get_resources())
|
|
|
|
def get_actions(self):
|
|
return []
|
|
|
|
def get_request_extensions(self):
|
|
return []
|
|
|
|
|
|
class AZTestPlugin(db_base_plugin_v2.NeutronDbPluginV2,
|
|
agents_db.AgentDbMixin):
|
|
supported_extension_aliases = ["agent", "availability_zone"]
|
|
|
|
|
|
class AZTestCommon(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
|
|
def _register_azs(self):
|
|
self.agent1 = helpers.register_dhcp_agent(host='host1', az='nova1')
|
|
self.agent2 = helpers.register_dhcp_agent(host='host2', az='nova2')
|
|
self.agent3 = helpers.register_l3_agent(host='host2', az='nova2')
|
|
self.agent4 = helpers.register_l3_agent(host='host3', az='nova3')
|
|
self.agent5 = helpers.register_l3_agent(host='host4', az='nova2')
|
|
|
|
|
|
class TestAZAgentCase(AZTestCommon):
|
|
def setUp(self):
|
|
plugin = ('neutron.tests.unit.extensions.'
|
|
'test_availability_zone.AZTestPlugin')
|
|
ext_mgr = AZExtensionManager()
|
|
super(TestAZAgentCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
|
|
|
|
def test_list_availability_zones(self):
|
|
self._register_azs()
|
|
helpers.set_agent_admin_state(self.agent3['id'], admin_state_up=False)
|
|
helpers.set_agent_admin_state(self.agent4['id'], admin_state_up=False)
|
|
expected = [
|
|
{'name': 'nova1', 'resource': 'network', 'state': 'available'},
|
|
{'name': 'nova2', 'resource': 'network', 'state': 'available'},
|
|
{'name': 'nova2', 'resource': 'router', 'state': 'available'},
|
|
{'name': 'nova3', 'resource': 'router', 'state': 'unavailable'}]
|
|
res = self._list('availability_zones')
|
|
azs = res['availability_zones']
|
|
self.assertItemsEqual(expected, azs)
|
|
# not admin case
|
|
ctx = context.Context('', 'noadmin')
|
|
res = self._list('availability_zones', neutron_context=ctx)
|
|
azs = res['availability_zones']
|
|
self.assertItemsEqual(expected, azs)
|
|
|
|
def test_list_agent_with_az(self):
|
|
helpers.register_dhcp_agent(host='host1', az='nova1')
|
|
res = self._list('agents')
|
|
self.assertEqual('nova1',
|
|
res['agents'][0]['availability_zone'])
|
|
|
|
def test_validate_availability_zones(self):
|
|
self._register_azs()
|
|
ctx = context.Context('', 'tenant_id')
|
|
self.plugin.validate_availability_zones(ctx, 'network',
|
|
['nova1', 'nova2'])
|
|
self.plugin.validate_availability_zones(ctx, 'router',
|
|
['nova2', 'nova3'])
|
|
self.assertRaises(az_ext.AvailabilityZoneNotFound,
|
|
self.plugin.validate_availability_zones,
|
|
ctx, 'router', ['nova1'])
|
|
|
|
|
|
class TestAZNetworkCase(AZTestCommon):
|
|
def setUp(self):
|
|
plugin = 'neutron.plugins.ml2.plugin.Ml2Plugin'
|
|
ext_mgr = AZExtensionManager()
|
|
super(TestAZNetworkCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
|
|
|
|
def test_availability_zones_in_create_response(self):
|
|
with self.network() as net:
|
|
self.assertIn('availability_zone_hints', net['network'])
|
|
self.assertIn('availability_zones', net['network'])
|
|
|
|
def test_create_network_with_az(self):
|
|
self._register_azs()
|
|
az_hints = ['nova1']
|
|
with self.network(availability_zone_hints=az_hints) as net:
|
|
res = self._show('networks', net['network']['id'])
|
|
self.assertItemsEqual(az_hints,
|
|
res['network']['availability_zone_hints'])
|
|
|
|
def test_create_network_with_azs(self):
|
|
self._register_azs()
|
|
az_hints = ['nova1', 'nova2']
|
|
with self.network(availability_zone_hints=az_hints) as net:
|
|
res = self._show('networks', net['network']['id'])
|
|
self.assertItemsEqual(az_hints,
|
|
res['network']['availability_zone_hints'])
|
|
|
|
def test_create_network_without_az(self):
|
|
with self.network() as net:
|
|
res = self._show('networks', net['network']['id'])
|
|
self.assertEqual([], res['network']['availability_zone_hints'])
|
|
|
|
def test_create_network_with_empty_az(self):
|
|
with self.network(availability_zone_hints=[]) as net:
|
|
res = self._show('networks', net['network']['id'])
|
|
self.assertEqual([], res['network']['availability_zone_hints'])
|
|
|
|
def test_create_network_with_not_exist_az(self):
|
|
res = self._create_network(self.fmt, 'net', True,
|
|
availability_zone_hints=['nova3'])
|
|
self.assertEqual(404, res.status_int)
|