a1e483d049
Of DHCP and L3 agents, NVP uses DHCP; This patch adds support for the extension to this plugin. This patch also moves some tests around, as a result of the refactory done in https://review.openstack.org/#/c/35266/ Some code duplication is also removed. Implements blueprint nvp-agent-scheduler-extension Change-Id: I4ca1148e81fdb39bf6b58eef806536439e9f0c6f
80 lines
3.1 KiB
Python
80 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
|
|
import os
|
|
|
|
from neutron.common.test_lib import test_config
|
|
import neutron.plugins.nicira as nvp_plugin
|
|
from neutron.tests.unit.nicira import fake_nvpapiclient
|
|
from neutron.tests.unit.openvswitch import test_agent_scheduler as test_base
|
|
|
|
|
|
NVP_MODULE_PATH = nvp_plugin.__name__
|
|
NVP_INI_CONFIG_PATH = os.path.join(os.path.dirname(__file__),
|
|
'etc/nvp.ini.full.test')
|
|
NVP_STUBS_PATH = os.path.join(os.path.dirname(__file__), 'etc')
|
|
|
|
PLUGIN_NAME = '%s.NeutronPlugin.NvpPluginV2' % nvp_plugin.__name__
|
|
|
|
|
|
class NVPDhcpAgentNotifierTestCase(test_base.OvsDhcpAgentNotifierTestCase):
|
|
plugin_str = PLUGIN_NAME
|
|
|
|
def setUp(self):
|
|
test_config['plugin_name_v2'] = PLUGIN_NAME
|
|
test_config['config_files'] = [NVP_INI_CONFIG_PATH]
|
|
|
|
# mock nvp api client
|
|
self.fc = fake_nvpapiclient.FakeClient(NVP_STUBS_PATH)
|
|
self.mock_nvpapi = mock.patch('%s.NvpApiClient.NVPApiHelper'
|
|
% NVP_MODULE_PATH, autospec=True)
|
|
instance = self.mock_nvpapi.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(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
|