openstack
/
neutron
Code Issues Proposed changes

Merge "Fix a KeyError" into stable/stein

This commit is contained in:
Zuul 2019-04-10 20:23:49 +00:00 committed by Gerrit Code Review
parent 838ad46643 0ce7f6e1b6
commit 899aa14edf
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/plugin.py
View File

@ -1004,7 +1004,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
need_network_update_notify = False
with db_api.CONTEXT_WRITER.using(context):
original_network = super(Ml2Plugin, self).get_network(context, id)
original_network = self.get_network(context, id)
self._update_provider_network_attributes(
context, original_network, net_data)
updated_network = super(Ml2Plugin, self).update_network(context,

44
neutron/tests/unit/plugins/ml2/test_plugin.py
View File

@ -2355,6 +2355,50 @@ class TestMultiSegmentNetworks(Ml2PluginV2TestCase):
self.assertEqual(1, network['network'][pnet.SEGMENTATION_ID])
self.assertNotIn(mpnet_apidef.SEGMENTS, network['network'])
def test_fail_update_network_provider_attr(self):
data = {'network': {'name': 'net1',
pnet.NETWORK_TYPE: 'flat',
pnet.PHYSICAL_NETWORK: 'physnet1',
'tenant_id': 'tenant_one'}}
network_req = self.new_create_request('networks', data)
network = self.deserialize(self.fmt,
network_req.get_response(self.api))
self.assertEqual('flat', network['network'][pnet.NETWORK_TYPE])
self.assertEqual('physnet1', network['network'][pnet.PHYSICAL_NETWORK])
self.assertNotIn(mpnet_apidef.SEGMENTS, network['network'])
data = {'network': {'name': 'updated-net1',
pnet.NETWORK_TYPE: 'flat',
pnet.PHYSICAL_NETWORK: 'update_physnet1'}}
network_req = self.new_update_request('networks', data,
network['network']['id'])
network = self.deserialize(self.fmt,
network_req.get_response(self.api))
self.assertIn('NeutronError', network)
self.assertIn(('Invalid input for operation: Plugin does not '
'support updating the following provider network '
'attributes: '),
network['NeutronError']['message'])
def test_update_network_provider_attr_no_change(self):
data = {'network': {'name': 'net1',
pnet.NETWORK_TYPE: 'flat',
pnet.PHYSICAL_NETWORK: 'physnet1',
'tenant_id': 'tenant_one'}}
network_req = self.new_create_request('networks', data)
network = self.deserialize(self.fmt,
network_req.get_response(self.api))
self.assertEqual('flat', network['network'][pnet.NETWORK_TYPE])
self.assertEqual('physnet1', network['network'][pnet.PHYSICAL_NETWORK])
self.assertNotIn(mpnet_apidef.SEGMENTS, network['network'])
data = {'network': {'name': 'updated-net1',
pnet.NETWORK_TYPE: 'flat',
pnet.PHYSICAL_NETWORK: 'physnet1'}}
network_req = self.new_update_request('networks', data,
network['network']['id'])
network = self.deserialize(self.fmt,
network_req.get_response(self.api))
self.assertEqual('updated-net1', network['network']['name'])
def test_create_network_single_multiprovider(self):
data = {'network': {'name': 'net1',
mpnet_apidef.SEGMENTS: