b277d6f991
The replication mode on switches and routers should have been configurable to use source replication if one did not want to deploy service node(s). This patch fixes that by making this option configurable. Change-Id: Id9e8043c602b5e9349c10247eab993e59db5a52c Closes-bug: #1285383
234 lines
10 KiB
Python
234 lines
10 KiB
Python
# Copyright 2013 VMware, 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 fixtures
|
|
|
|
import mock
|
|
from oslo.config import cfg
|
|
|
|
from neutron.common import config as q_config
|
|
from neutron.manager import NeutronManager
|
|
from neutron.openstack.common import uuidutils
|
|
from neutron.plugins.vmware.api_client import client
|
|
from neutron.plugins.vmware.api_client import version
|
|
from neutron.plugins.vmware.common import config # noqa
|
|
from neutron.plugins.vmware.common import exceptions
|
|
from neutron.plugins.vmware.common import sync
|
|
from neutron.plugins.vmware import nsx_cluster
|
|
from neutron.plugins.vmware.nsxlib import lsn as lsnlib
|
|
from neutron.tests import base
|
|
from neutron.tests.unit.vmware import get_fake_conf
|
|
from neutron.tests.unit.vmware import PLUGIN_NAME
|
|
|
|
BASE_CONF_PATH = get_fake_conf('neutron.conf.test')
|
|
NSX_INI_PATH = get_fake_conf('nsx.ini.basic.test')
|
|
NSX_INI_FULL_PATH = get_fake_conf('nsx.ini.full.test')
|
|
NSX_INI_AGENTLESS_PATH = get_fake_conf('nsx.ini.agentless.test')
|
|
NVP_INI_DEPR_PATH = get_fake_conf('nvp.ini.full.test')
|
|
|
|
|
|
class NSXClusterTest(base.BaseTestCase):
|
|
|
|
cluster_opts = {'default_tz_uuid': uuidutils.generate_uuid(),
|
|
'default_l2_gw_service_uuid': uuidutils.generate_uuid(),
|
|
'default_l2_gw_service_uuid': uuidutils.generate_uuid(),
|
|
'nsx_user': 'foo',
|
|
'nsx_password': 'bar',
|
|
'req_timeout': 45,
|
|
'http_timeout': 25,
|
|
'retries': 7,
|
|
'redirects': 23,
|
|
'default_interface_name': 'baz',
|
|
'nsx_controllers': ['1.1.1.1:443']}
|
|
|
|
def test_create_cluster(self):
|
|
cluster = nsx_cluster.NSXCluster(**self.cluster_opts)
|
|
for (k, v) in self.cluster_opts.iteritems():
|
|
self.assertEqual(v, getattr(cluster, k))
|
|
|
|
def test_create_cluster_default_port(self):
|
|
opts = self.cluster_opts.copy()
|
|
opts['nsx_controllers'] = ['1.1.1.1']
|
|
cluster = nsx_cluster.NSXCluster(**opts)
|
|
for (k, v) in self.cluster_opts.iteritems():
|
|
self.assertEqual(v, getattr(cluster, k))
|
|
|
|
def test_create_cluster_missing_required_attribute_raises(self):
|
|
opts = self.cluster_opts.copy()
|
|
opts.pop('default_tz_uuid')
|
|
self.assertRaises(exceptions.InvalidClusterConfiguration,
|
|
nsx_cluster.NSXCluster, **opts)
|
|
|
|
|
|
class ConfigurationTest(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(ConfigurationTest, self).setUp()
|
|
self.useFixture(fixtures.MonkeyPatch(
|
|
'neutron.manager.NeutronManager._instance',
|
|
None))
|
|
# Avoid runs of the synchronizer looping call
|
|
patch_sync = mock.patch.object(sync, '_start_loopingcall')
|
|
patch_sync.start()
|
|
self.addCleanup(patch_sync.stop)
|
|
|
|
def _assert_required_options(self, cluster):
|
|
self.assertEqual(cluster.nsx_controllers, ['fake_1:443', 'fake_2:443'])
|
|
self.assertEqual(cluster.default_tz_uuid, 'fake_tz_uuid')
|
|
self.assertEqual(cluster.nsx_user, 'foo')
|
|
self.assertEqual(cluster.nsx_password, 'bar')
|
|
|
|
def _assert_extra_options(self, cluster):
|
|
self.assertEqual(14, cluster.req_timeout)
|
|
self.assertEqual(13, cluster.http_timeout)
|
|
self.assertEqual(12, cluster.redirects)
|
|
self.assertEqual(11, cluster.retries)
|
|
self.assertEqual('whatever', cluster.default_l2_gw_service_uuid)
|
|
self.assertEqual('whatever', cluster.default_l3_gw_service_uuid)
|
|
self.assertEqual('whatever', cluster.default_interface_name)
|
|
|
|
def test_load_plugin_with_full_options(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_FULL_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
plugin = NeutronManager().get_plugin()
|
|
cluster = plugin.cluster
|
|
self._assert_required_options(cluster)
|
|
self._assert_extra_options(cluster)
|
|
|
|
def test_load_plugin_with_required_options_only(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
plugin = NeutronManager().get_plugin()
|
|
self._assert_required_options(plugin.cluster)
|
|
|
|
def test_defaults(self):
|
|
self.assertEqual(5000, cfg.CONF.NSX.max_lp_per_bridged_ls)
|
|
self.assertEqual(256, cfg.CONF.NSX.max_lp_per_overlay_ls)
|
|
self.assertEqual(10, cfg.CONF.NSX.concurrent_connections)
|
|
self.assertEqual('access_network', cfg.CONF.NSX.metadata_mode)
|
|
self.assertEqual('stt', cfg.CONF.NSX.default_transport_type)
|
|
self.assertEqual('service', cfg.CONF.NSX.replication_mode)
|
|
|
|
self.assertIsNone(cfg.CONF.default_tz_uuid)
|
|
self.assertEqual('admin', cfg.CONF.nsx_user)
|
|
self.assertEqual('admin', cfg.CONF.nsx_password)
|
|
self.assertEqual(30, cfg.CONF.req_timeout)
|
|
self.assertEqual(10, cfg.CONF.http_timeout)
|
|
self.assertEqual(2, cfg.CONF.retries)
|
|
self.assertEqual(2, cfg.CONF.redirects)
|
|
self.assertIsNone(cfg.CONF.nsx_controllers)
|
|
self.assertIsNone(cfg.CONF.default_l3_gw_service_uuid)
|
|
self.assertIsNone(cfg.CONF.default_l2_gw_service_uuid)
|
|
self.assertEqual('breth0', cfg.CONF.default_interface_name)
|
|
|
|
def test_load_api_extensions(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_FULL_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
# Load the configuration, and initialize the plugin
|
|
NeutronManager().get_plugin()
|
|
self.assertIn('extensions', cfg.CONF.api_extensions_path)
|
|
|
|
def test_agentless_extensions(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_AGENTLESS_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
self.assertEqual(config.AgentModes.AGENTLESS,
|
|
cfg.CONF.NSX.agent_mode)
|
|
# The version returned from NSX does not really matter here
|
|
with mock.patch.object(client.NsxApiClient,
|
|
'get_version',
|
|
return_value=version.Version("9.9")):
|
|
with mock.patch.object(lsnlib,
|
|
'service_cluster_exists',
|
|
return_value=True):
|
|
plugin = NeutronManager().get_plugin()
|
|
self.assertNotIn('agent',
|
|
plugin.supported_extension_aliases)
|
|
self.assertNotIn('dhcp_agent_scheduler',
|
|
plugin.supported_extension_aliases)
|
|
|
|
def test_agentless_extensions_version_fail(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_AGENTLESS_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
self.assertEqual(config.AgentModes.AGENTLESS,
|
|
cfg.CONF.NSX.agent_mode)
|
|
with mock.patch.object(client.NsxApiClient,
|
|
'get_version',
|
|
return_value=version.Version("3.2")):
|
|
self.assertRaises(exceptions.NsxPluginException, NeutronManager)
|
|
|
|
def test_agentless_extensions_unmet_deps_fail(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_AGENTLESS_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
self.assertEqual(config.AgentModes.AGENTLESS,
|
|
cfg.CONF.NSX.agent_mode)
|
|
with mock.patch.object(client.NsxApiClient,
|
|
'get_version',
|
|
return_value=version.Version("3.2")):
|
|
with mock.patch.object(lsnlib,
|
|
'service_cluster_exists',
|
|
return_value=False):
|
|
self.assertRaises(exceptions.NsxPluginException,
|
|
NeutronManager)
|
|
|
|
def test_agent_extensions(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NSX_INI_FULL_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
self.assertEqual(config.AgentModes.AGENT,
|
|
cfg.CONF.NSX.agent_mode)
|
|
plugin = NeutronManager().get_plugin()
|
|
self.assertIn('agent',
|
|
plugin.supported_extension_aliases)
|
|
self.assertIn('dhcp_agent_scheduler',
|
|
plugin.supported_extension_aliases)
|
|
|
|
|
|
class OldNVPConfigurationTest(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(OldNVPConfigurationTest, self).setUp()
|
|
self.useFixture(fixtures.MonkeyPatch(
|
|
'neutron.manager.NeutronManager._instance',
|
|
None))
|
|
# Avoid runs of the synchronizer looping call
|
|
patch_sync = mock.patch.object(sync, '_start_loopingcall')
|
|
patch_sync.start()
|
|
self.addCleanup(patch_sync.stop)
|
|
|
|
def _assert_required_options(self, cluster):
|
|
self.assertEqual(cluster.nsx_controllers, ['fake_1:443', 'fake_2:443'])
|
|
self.assertEqual(cluster.nsx_user, 'foo')
|
|
self.assertEqual(cluster.nsx_password, 'bar')
|
|
self.assertEqual(cluster.default_tz_uuid, 'fake_tz_uuid')
|
|
|
|
def test_load_plugin_with_deprecated_options(self):
|
|
q_config.parse(['--config-file', BASE_CONF_PATH,
|
|
'--config-file', NVP_INI_DEPR_PATH])
|
|
cfg.CONF.set_override('core_plugin', PLUGIN_NAME)
|
|
plugin = NeutronManager().get_plugin()
|
|
cluster = plugin.cluster
|
|
# Verify old nvp_* params have been fully parsed
|
|
self._assert_required_options(cluster)
|
|
self.assertEqual(4, cluster.req_timeout)
|
|
self.assertEqual(3, cluster.http_timeout)
|
|
self.assertEqual(2, cluster.retries)
|
|
self.assertEqual(2, cluster.redirects)
|