openstack
/
neutron
Code Issues Proposed changes

Merge "Stops update_network handling updates it shouldn't"

This commit is contained in:
Jenkins 2016-03-12 00:22:58 +00:00 committed by Gerrit Code Review
parent dc68662a0b e0b3665280
commit e1251d90a0
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/db_base_plugin_v2.py
View File

@ -356,7 +356,11 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
elif not update_shared and entry:
context.session.delete(entry)
context.session.expire(network, ['rbac_entries'])
network.update(n)
# The filter call removes attributes from the body received from
# the API that are logically tied to network resources but are
# stored in other database tables handled by extensions
network.update(self._filter_non_model_columns(n,
models_v2.Network))
return self._make_network_dict(network, context=context)
def delete_network(self, context, id):

24
neutron/tests/unit/extensions/test_dns.py
View File

@ -57,6 +57,19 @@ class DnsExtensionTestCase(test_db_base_plugin_v2.TestNetworksV2):
ext_mgr = DnsExtensionManager()
super(DnsExtensionTestCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def _create_network(self, fmt, name, admin_state_up,
arg_list=None, set_context=False, tenant_id=None,
**kwargs):
new_arg_list = ('dns_domain',)
if arg_list is not None:
new_arg_list = arg_list + new_arg_list
return super(DnsExtensionTestCase,
self)._create_network(fmt, name, admin_state_up,
arg_list=new_arg_list,
set_context=set_context,
tenant_id=tenant_id,
**kwargs)
def _create_port(self, fmt, net_id, expected_res_status=None,
arg_list=None, set_context=False, tenant_id=None,
**kwargs):
@ -474,3 +487,14 @@ class DnsExtensionTestCase(test_db_base_plugin_v2.TestNetworksV2):
res = self._create_port(self.fmt, net_id=network['network']['id'],
dns_name=dns_name)
self.assertEqual(201, res.status_code)
def test_update_network_dns_domain(self):
with self.network() as network:
data = {'network': {'dns_domain': 'my-domain.org.'}}
req = self.new_update_request('networks',
data,
network['network']['id'])
res = req.get_response(self.api)
self.assertEqual(200, res.status_code)
self.assertNotIn('dns_domain',
self.deserialize(self.fmt, res)['network'])