a43a4d34e7
Adds an external IPs field to the external gateway information for a router so the external IP address of the router can be read by the tenant. DocImpact Closes-Bug: #1255142 Change-Id: If4e77c445e9b855ff77deea6c8df4a0b3cf249d4
445 lines
19 KiB
Python
445 lines
19 KiB
Python
# Copyright 2013 VMware, Inc.
|
|
# 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 oslo.config import cfg
|
|
from webob import exc
|
|
|
|
from neutron.common import constants
|
|
from neutron.db import api as db_api
|
|
from neutron.db import external_net_db
|
|
from neutron.db import l3_db
|
|
from neutron.db import l3_gwmode_db
|
|
from neutron.db import models_v2
|
|
from neutron.extensions import l3
|
|
from neutron.extensions import l3_ext_gw_mode
|
|
from neutron.openstack.common import uuidutils
|
|
from neutron.tests.unit import test_db_plugin
|
|
from neutron.tests.unit import test_l3_plugin
|
|
from neutron.tests.unit import testlib_api
|
|
from neutron.tests.unit import testlib_plugin
|
|
|
|
_uuid = uuidutils.generate_uuid
|
|
FAKE_GW_PORT_ID = _uuid()
|
|
FAKE_GW_PORT_MAC = 'aa:bb:cc:dd:ee:ff'
|
|
FAKE_FIP_EXT_PORT_ID = _uuid()
|
|
FAKE_FIP_EXT_PORT_MAC = '11:22:33:44:55:66'
|
|
FAKE_FIP_INT_PORT_ID = _uuid()
|
|
FAKE_FIP_INT_PORT_MAC = 'aa:aa:aa:aa:aa:aa'
|
|
FAKE_ROUTER_PORT_ID = _uuid()
|
|
FAKE_ROUTER_PORT_MAC = 'bb:bb:bb:bb:bb:bb'
|
|
|
|
|
|
class TestExtensionManager(object):
|
|
|
|
def get_resources(self):
|
|
# Simulate extension of L3 attribute map
|
|
for key in l3.RESOURCE_ATTRIBUTE_MAP.keys():
|
|
l3.RESOURCE_ATTRIBUTE_MAP[key].update(
|
|
l3_ext_gw_mode.EXTENDED_ATTRIBUTES_2_0.get(key, {}))
|
|
return l3.L3.get_resources()
|
|
|
|
def get_actions(self):
|
|
return []
|
|
|
|
def get_request_extensions(self):
|
|
return []
|
|
|
|
|
|
# A simple class for making a concrete class out of the mixin
|
|
# for the case of a plugin that integrates l3 routing.
|
|
class TestDbIntPlugin(test_l3_plugin.TestL3NatIntPlugin,
|
|
l3_gwmode_db.L3_NAT_db_mixin):
|
|
|
|
supported_extension_aliases = ["external-net", "router", "ext-gw-mode"]
|
|
|
|
|
|
# A simple class for making a concrete class out of the mixin
|
|
# for the case of a l3 router service plugin
|
|
class TestDbSepPlugin(test_l3_plugin.TestL3NatServicePlugin,
|
|
l3_gwmode_db.L3_NAT_db_mixin):
|
|
|
|
supported_extension_aliases = ["router", "ext-gw-mode"]
|
|
|
|
|
|
class TestL3GwModeMixin(testlib_api.SqlTestCase,
|
|
testlib_plugin.PluginSetupHelper):
|
|
|
|
def setUp(self):
|
|
super(TestL3GwModeMixin, self).setUp()
|
|
plugin = __name__ + '.' + TestDbIntPlugin.__name__
|
|
self.setup_coreplugin(plugin)
|
|
self.target_object = TestDbIntPlugin()
|
|
# Patch the context
|
|
ctx_patcher = mock.patch('neutron.context', autospec=True)
|
|
mock_context = ctx_patcher.start()
|
|
self.context = mock_context.get_admin_context()
|
|
# This ensure also calls to elevated work in unit tests
|
|
self.context.elevated.return_value = self.context
|
|
self.context.session = db_api.get_session()
|
|
# Create sample data for tests
|
|
self.ext_net_id = _uuid()
|
|
self.int_net_id = _uuid()
|
|
self.int_sub_id = _uuid()
|
|
self.tenant_id = 'the_tenant'
|
|
self.network = models_v2.Network(
|
|
id=self.ext_net_id,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
status=constants.NET_STATUS_ACTIVE)
|
|
self.net_ext = external_net_db.ExternalNetwork(
|
|
network_id=self.ext_net_id)
|
|
self.context.session.add(self.network)
|
|
# The following is to avoid complains from sqlite on
|
|
# foreign key violations
|
|
self.context.session.flush()
|
|
self.context.session.add(self.net_ext)
|
|
self.router = l3_db.Router(
|
|
id=_uuid(),
|
|
name=None,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
status=constants.NET_STATUS_ACTIVE,
|
|
enable_snat=True,
|
|
gw_port_id=None)
|
|
self.context.session.add(self.router)
|
|
self.context.session.flush()
|
|
self.router_gw_port = models_v2.Port(
|
|
id=FAKE_GW_PORT_ID,
|
|
tenant_id=self.tenant_id,
|
|
device_id=self.router.id,
|
|
device_owner=l3_db.DEVICE_OWNER_ROUTER_GW,
|
|
admin_state_up=True,
|
|
status=constants.PORT_STATUS_ACTIVE,
|
|
mac_address=FAKE_GW_PORT_MAC,
|
|
network_id=self.ext_net_id)
|
|
self.router.gw_port_id = self.router_gw_port.id
|
|
self.context.session.add(self.router)
|
|
self.context.session.add(self.router_gw_port)
|
|
self.context.session.flush()
|
|
self.fip_ext_port = models_v2.Port(
|
|
id=FAKE_FIP_EXT_PORT_ID,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
device_id=self.router.id,
|
|
device_owner=l3_db.DEVICE_OWNER_FLOATINGIP,
|
|
status=constants.PORT_STATUS_ACTIVE,
|
|
mac_address=FAKE_FIP_EXT_PORT_MAC,
|
|
network_id=self.ext_net_id)
|
|
self.context.session.add(self.fip_ext_port)
|
|
self.context.session.flush()
|
|
self.int_net = models_v2.Network(
|
|
id=self.int_net_id,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
status=constants.NET_STATUS_ACTIVE)
|
|
self.int_sub = models_v2.Subnet(
|
|
id=self.int_sub_id,
|
|
tenant_id=self.tenant_id,
|
|
ip_version=4,
|
|
cidr='3.3.3.0/24',
|
|
gateway_ip='3.3.3.1',
|
|
network_id=self.int_net_id)
|
|
self.router_port = models_v2.Port(
|
|
id=FAKE_ROUTER_PORT_ID,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
device_id=self.router.id,
|
|
device_owner=l3_db.DEVICE_OWNER_ROUTER_INTF,
|
|
status=constants.PORT_STATUS_ACTIVE,
|
|
mac_address=FAKE_ROUTER_PORT_MAC,
|
|
network_id=self.int_net_id)
|
|
self.router_port_ip_info = models_v2.IPAllocation(
|
|
port_id=self.router_port.id,
|
|
network_id=self.int_net.id,
|
|
subnet_id=self.int_sub_id,
|
|
ip_address='3.3.3.1')
|
|
self.context.session.add(self.int_net)
|
|
self.context.session.add(self.int_sub)
|
|
self.context.session.add(self.router_port)
|
|
self.context.session.add(self.router_port_ip_info)
|
|
self.context.session.flush()
|
|
self.fip_int_port = models_v2.Port(
|
|
id=FAKE_FIP_INT_PORT_ID,
|
|
tenant_id=self.tenant_id,
|
|
admin_state_up=True,
|
|
device_id='something',
|
|
device_owner='compute:nova',
|
|
status=constants.PORT_STATUS_ACTIVE,
|
|
mac_address=FAKE_FIP_INT_PORT_MAC,
|
|
network_id=self.int_net_id)
|
|
self.fip_int_ip_info = models_v2.IPAllocation(
|
|
port_id=self.fip_int_port.id,
|
|
network_id=self.int_net.id,
|
|
subnet_id=self.int_sub_id,
|
|
ip_address='3.3.3.3')
|
|
self.fip = l3_db.FloatingIP(
|
|
id=_uuid(),
|
|
floating_ip_address='1.1.1.2',
|
|
floating_network_id=self.ext_net_id,
|
|
floating_port_id=FAKE_FIP_EXT_PORT_ID,
|
|
fixed_port_id=None,
|
|
fixed_ip_address=None,
|
|
router_id=None)
|
|
self.context.session.add(self.fip_int_port)
|
|
self.context.session.add(self.fip_int_ip_info)
|
|
self.context.session.add(self.fip)
|
|
self.context.session.flush()
|
|
self.fip_request = {'port_id': FAKE_FIP_INT_PORT_ID,
|
|
'tenant_id': self.tenant_id}
|
|
|
|
def _get_gwports_dict(self, gw_ports):
|
|
return dict((gw_port['id'], gw_port)
|
|
for gw_port in gw_ports)
|
|
|
|
def _reset_ext_gw(self):
|
|
# Reset external gateway
|
|
self.router.gw_port_id = None
|
|
self.context.session.add(self.router)
|
|
self.context.session.flush()
|
|
|
|
def _test_update_router_gw(self, gw_info, expected_enable_snat):
|
|
self.target_object._update_router_gw_info(
|
|
self.context, self.router.id, gw_info)
|
|
router = self.target_object._get_router(
|
|
self.context, self.router.id)
|
|
try:
|
|
self.assertEqual(FAKE_GW_PORT_ID,
|
|
router.gw_port.id)
|
|
self.assertEqual(FAKE_GW_PORT_MAC,
|
|
router.gw_port.mac_address)
|
|
except AttributeError:
|
|
self.assertIsNone(router.gw_port)
|
|
self.assertEqual(expected_enable_snat, router.enable_snat)
|
|
|
|
def test_update_router_gw_with_gw_info_none(self):
|
|
self._test_update_router_gw(None, True)
|
|
|
|
def test_update_router_gw_with_network_only(self):
|
|
info = {'network_id': self.ext_net_id}
|
|
self._test_update_router_gw(info, True)
|
|
|
|
def test_update_router_gw_with_snat_disabled(self):
|
|
info = {'network_id': self.ext_net_id,
|
|
'enable_snat': False}
|
|
self._test_update_router_gw(info, False)
|
|
|
|
def test_make_router_dict_no_ext_gw(self):
|
|
self._reset_ext_gw()
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
self.assertIsNone(router_dict[l3.EXTERNAL_GW_INFO])
|
|
|
|
def test_make_router_dict_with_ext_gw(self):
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
self.assertEqual({'network_id': self.ext_net_id,
|
|
'enable_snat': True,
|
|
'external_fixed_ips': []},
|
|
router_dict[l3.EXTERNAL_GW_INFO])
|
|
|
|
def test_make_router_dict_with_ext_gw_snat_disabled(self):
|
|
self.router.enable_snat = False
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
self.assertEqual({'network_id': self.ext_net_id,
|
|
'enable_snat': False,
|
|
'external_fixed_ips': []},
|
|
router_dict[l3.EXTERNAL_GW_INFO])
|
|
|
|
def test_build_routers_list_no_ext_gw(self):
|
|
self._reset_ext_gw()
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
routers = self.target_object._build_routers_list(self.context,
|
|
[router_dict],
|
|
[])
|
|
self.assertEqual(1, len(routers))
|
|
router = routers[0]
|
|
self.assertIsNone(router.get('gw_port'))
|
|
self.assertIsNone(router.get('enable_snat'))
|
|
|
|
def test_build_routers_list_with_ext_gw(self):
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
routers = self.target_object._build_routers_list(
|
|
self.context, [router_dict],
|
|
self._get_gwports_dict([self.router.gw_port]))
|
|
self.assertEqual(1, len(routers))
|
|
router = routers[0]
|
|
self.assertIsNotNone(router.get('gw_port'))
|
|
self.assertEqual(FAKE_GW_PORT_ID, router['gw_port']['id'])
|
|
self.assertTrue(router.get('enable_snat'))
|
|
|
|
def test_build_routers_list_with_ext_gw_snat_disabled(self):
|
|
self.router.enable_snat = False
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
routers = self.target_object._build_routers_list(
|
|
self.context, [router_dict],
|
|
self._get_gwports_dict([self.router.gw_port]))
|
|
self.assertEqual(1, len(routers))
|
|
router = routers[0]
|
|
self.assertIsNotNone(router.get('gw_port'))
|
|
self.assertEqual(FAKE_GW_PORT_ID, router['gw_port']['id'])
|
|
self.assertFalse(router.get('enable_snat'))
|
|
|
|
def test_build_routers_list_with_gw_port_mismatch(self):
|
|
router_dict = self.target_object._make_router_dict(self.router)
|
|
routers = self.target_object._build_routers_list(
|
|
self.context, [router_dict], {})
|
|
self.assertEqual(1, len(routers))
|
|
router = routers[0]
|
|
self.assertIsNone(router.get('gw_port'))
|
|
self.assertIsNone(router.get('enable_snat'))
|
|
|
|
|
|
class ExtGwModeIntTestCase(test_db_plugin.NeutronDbPluginV2TestCase,
|
|
test_l3_plugin.L3NatTestCaseMixin):
|
|
|
|
def setUp(self, plugin=None, svc_plugins=None, ext_mgr=None):
|
|
# Store l3 resource attribute map as it will be updated
|
|
self._l3_attribute_map_bk = {}
|
|
for item in l3.RESOURCE_ATTRIBUTE_MAP:
|
|
self._l3_attribute_map_bk[item] = (
|
|
l3.RESOURCE_ATTRIBUTE_MAP[item].copy())
|
|
plugin = plugin or (
|
|
'neutron.tests.unit.test_extension_ext_gw_mode.TestDbIntPlugin')
|
|
# for these tests we need to enable overlapping ips
|
|
cfg.CONF.set_default('allow_overlapping_ips', True)
|
|
ext_mgr = ext_mgr or TestExtensionManager()
|
|
super(ExtGwModeIntTestCase, self).setUp(plugin=plugin,
|
|
ext_mgr=ext_mgr,
|
|
service_plugins=svc_plugins)
|
|
self.addCleanup(self.restore_l3_attribute_map)
|
|
|
|
def restore_l3_attribute_map(self):
|
|
l3.RESOURCE_ATTRIBUTE_MAP = self._l3_attribute_map_bk
|
|
|
|
def tearDown(self):
|
|
super(ExtGwModeIntTestCase, self).tearDown()
|
|
|
|
def _set_router_external_gateway(self, router_id, network_id,
|
|
snat_enabled=None,
|
|
expected_code=exc.HTTPOk.code,
|
|
neutron_context=None):
|
|
ext_gw_info = {'network_id': network_id}
|
|
# Need to set enable_snat also if snat_enabled == False
|
|
if snat_enabled is not None:
|
|
ext_gw_info['enable_snat'] = snat_enabled
|
|
return self._update('routers', router_id,
|
|
{'router': {'external_gateway_info':
|
|
ext_gw_info}},
|
|
expected_code=expected_code,
|
|
neutron_context=neutron_context)
|
|
|
|
def test_router_create_show_no_ext_gwinfo(self):
|
|
name = 'router1'
|
|
tenant_id = _uuid()
|
|
expected_value = [('name', name), ('tenant_id', tenant_id),
|
|
('admin_state_up', True), ('status', 'ACTIVE'),
|
|
('external_gateway_info', None)]
|
|
with self.router(name=name, admin_state_up=True,
|
|
tenant_id=tenant_id) as router:
|
|
res = self._show('routers', router['router']['id'])
|
|
for k, v in expected_value:
|
|
self.assertEqual(res['router'][k], v)
|
|
|
|
def _test_router_create_show_ext_gwinfo(self, snat_input_value,
|
|
snat_expected_value):
|
|
name = 'router1'
|
|
tenant_id = _uuid()
|
|
with self.subnet() as s:
|
|
ext_net_id = s['subnet']['network_id']
|
|
self._set_net_external(ext_net_id)
|
|
input_value = {'network_id': ext_net_id}
|
|
if snat_input_value in (True, False):
|
|
input_value['enable_snat'] = snat_input_value
|
|
expected_value = [('name', name), ('tenant_id', tenant_id),
|
|
('admin_state_up', True), ('status', 'ACTIVE'),
|
|
('external_gateway_info',
|
|
{'network_id': ext_net_id,
|
|
'enable_snat': snat_expected_value,
|
|
'external_fixed_ips': [{
|
|
'ip_address': mock.ANY,
|
|
'subnet_id': s['subnet']['id']}]})]
|
|
with self.router(
|
|
name=name, admin_state_up=True, tenant_id=tenant_id,
|
|
external_gateway_info=input_value) as router:
|
|
res = self._show('routers', router['router']['id'])
|
|
for k, v in expected_value:
|
|
self.assertEqual(res['router'][k], v)
|
|
|
|
def test_router_create_show_ext_gwinfo_default(self):
|
|
self._test_router_create_show_ext_gwinfo(None, True)
|
|
|
|
def test_router_create_show_ext_gwinfo_with_snat_enabled(self):
|
|
self._test_router_create_show_ext_gwinfo(True, True)
|
|
|
|
def test_router_create_show_ext_gwinfo_with_snat_disabled(self):
|
|
self._test_router_create_show_ext_gwinfo(False, False)
|
|
|
|
def _test_router_update_ext_gwinfo(self, snat_input_value,
|
|
snat_expected_value=False,
|
|
expected_http_code=exc.HTTPOk.code):
|
|
with self.router() as r:
|
|
with self.subnet() as s:
|
|
try:
|
|
ext_net_id = s['subnet']['network_id']
|
|
self._set_net_external(ext_net_id)
|
|
self._set_router_external_gateway(
|
|
r['router']['id'], ext_net_id,
|
|
snat_enabled=snat_input_value,
|
|
expected_code=expected_http_code)
|
|
if expected_http_code != exc.HTTPOk.code:
|
|
return
|
|
body = self._show('routers', r['router']['id'])
|
|
res_gw_info = body['router']['external_gateway_info']
|
|
self.assertEqual(res_gw_info['network_id'], ext_net_id)
|
|
self.assertEqual(res_gw_info['enable_snat'],
|
|
snat_expected_value)
|
|
finally:
|
|
self._remove_external_gateway_from_router(
|
|
r['router']['id'], ext_net_id)
|
|
|
|
def test_router_update_ext_gwinfo_default(self):
|
|
self._test_router_update_ext_gwinfo(None, True)
|
|
|
|
def test_router_update_ext_gwinfo_with_snat_enabled(self):
|
|
self._test_router_update_ext_gwinfo(True, True)
|
|
|
|
def test_router_update_ext_gwinfo_with_snat_disabled(self):
|
|
self._test_router_update_ext_gwinfo(False, False)
|
|
|
|
def test_router_update_ext_gwinfo_with_invalid_snat_setting(self):
|
|
self._test_router_update_ext_gwinfo(
|
|
'xxx', None, expected_http_code=exc.HTTPBadRequest.code)
|
|
|
|
|
|
class ExtGwModeSepTestCase(ExtGwModeIntTestCase):
|
|
|
|
def setUp(self, plugin=None):
|
|
# Store l3 resource attribute map as it will be updated
|
|
self._l3_attribute_map_bk = {}
|
|
for item in l3.RESOURCE_ATTRIBUTE_MAP:
|
|
self._l3_attribute_map_bk[item] = (
|
|
l3.RESOURCE_ATTRIBUTE_MAP[item].copy())
|
|
plugin = plugin or (
|
|
'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
|
|
# the L3 service plugin
|
|
l3_plugin = ('neutron.tests.unit.test_extension_ext_gw_mode.'
|
|
'TestDbSepPlugin')
|
|
svc_plugins = {'l3_plugin_name': l3_plugin}
|
|
# for these tests we need to enable overlapping ips
|
|
cfg.CONF.set_default('allow_overlapping_ips', True)
|
|
super(ExtGwModeSepTestCase, self).setUp(plugin=plugin,
|
|
svc_plugins=svc_plugins)
|
|
self.addCleanup(self.restore_l3_attribute_map)
|