2bfa1d45b4
Blueprint nicira-plugin-get-improvements With this patch GET operations on the Nicira plugin will not be forwarded anymore to the NVP backend. Resource operational status will be periodically retrieved from the NVP backend using a DynamicLoopingCall. The process has been designed with the aim of avoiding: 1) frequent queries to NVP for retrieving resource status 2) execution of large queries to NVP for retrieving the status of a consistent number of resources. The process can be tuned using a set of configuration variables. GET operations will now return a status which might differ from the actual status of the resource. For retrieving status in a punctual way, the field 'status' should be explicitly specified in the GET request (only 'show' support has been implemented in this patch) This patchs also makes some changes to the fake nvp api client in order to ensure each instance has a private set of dictionaries for fake nvp entities. Change-Id: Ia745b80d2826de32ba8d6883c0d6e0893047e123
78 lines
3.1 KiB
Python
78 lines
3.1 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# 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.
|
|
|
|
import mock
|
|
|
|
from neutron.common.test_lib import test_config
|
|
from neutron.plugins.nicira.common import sync
|
|
from neutron.tests.unit.nicira import fake_nvpapiclient
|
|
from neutron.tests.unit.nicira import get_fake_conf
|
|
from neutron.tests.unit.nicira import NVPAPI_NAME
|
|
from neutron.tests.unit.nicira import PLUGIN_NAME
|
|
from neutron.tests.unit.nicira import STUBS_PATH
|
|
from neutron.tests.unit.openvswitch import test_agent_scheduler as test_base
|
|
|
|
|
|
class NVPDhcpAgentNotifierTestCase(test_base.OvsDhcpAgentNotifierTestCase):
|
|
plugin_str = PLUGIN_NAME
|
|
|
|
def setUp(self):
|
|
test_config['plugin_name_v2'] = PLUGIN_NAME
|
|
test_config['config_files'] = [get_fake_conf('nvp.ini.full.test')]
|
|
|
|
# mock nvp api client
|
|
self.fc = fake_nvpapiclient.FakeClient(STUBS_PATH)
|
|
self.mock_nvpapi = mock.patch(NVPAPI_NAME, autospec=True)
|
|
instance = self.mock_nvpapi.start()
|
|
# Avoid runs of the synchronizer looping call
|
|
patch_sync = mock.patch.object(sync, '_start_loopingcall')
|
|
patch_sync.start()
|
|
|
|
def _fake_request(*args, **kwargs):
|
|
return self.fc.fake_request(*args, **kwargs)
|
|
|
|
# Emulate tests against NVP 2.x
|
|
instance.return_value.get_nvp_version.return_value = "2.999"
|
|
instance.return_value.request.side_effect = _fake_request
|
|
super(NVPDhcpAgentNotifierTestCase, self).setUp()
|
|
self.addCleanup(self.fc.reset_all)
|
|
self.addCleanup(patch_sync.stop)
|
|
self.addCleanup(self.mock_nvpapi.stop)
|
|
|
|
def _notification_mocks(self, hosts, mock_dhcp, net, subnet, port):
|
|
host_calls = {}
|
|
for host in hosts:
|
|
expected_calls = [
|
|
mock.call(
|
|
mock.ANY,
|
|
self.dhcp_notifier.make_msg(
|
|
'network_create_end',
|
|
payload={'network': net['network']}),
|
|
topic='dhcp_agent.' + host),
|
|
mock.call(
|
|
mock.ANY,
|
|
self.dhcp_notifier.make_msg(
|
|
'subnet_create_end',
|
|
payload={'subnet': subnet['subnet']}),
|
|
topic='dhcp_agent.' + host),
|
|
mock.call(
|
|
mock.ANY,
|
|
self.dhcp_notifier.make_msg(
|
|
'port_create_end',
|
|
payload={'port': port['port']}),
|
|
topic='dhcp_agent.' + host)]
|
|
host_calls[host] = expected_calls
|
|
return host_calls
|