openstack
/
neutron
Code Issues Proposed changes

Merge "Retrieve fresh network DB data before getting it in ml2" into stable/newton

This commit is contained in:
Jenkins 2017-05-25 22:40:33 +00:00 committed by Gerrit Code Review
parent d8c495cfc6 7534c00663
commit 280b6176db
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,6 +809,11 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
self.type_manager.extend_network_dict_provider(context,
updated_network)
# ToDO(QoS): This would change once EngineFacade moves out
db_network = self._get_network(context, id)
# Expire the db_network in current transaction, so that the join
# relationship can be updated.
context.session.expire(db_network)
updated_network = self.get_network(context, id)
# TODO(QoS): Move out to the extension framework somehow.

4
neutron/tests/tempest/api/test_qos.py
View File

@ -176,8 +176,8 @@ class QosTestJSON(base.BaseAdminNetworkTest):
self.assertIn(rule, actual_rule_types)
def _disassociate_network(self, client, network_id):
client.update_network(network_id, qos_policy_id=None)
updated_network = self.admin_client.show_network(network_id)
updated_network = client.update_network(network_id,
qos_policy_id=None)
self.assertIsNone(updated_network['network']['qos_policy_id'])
@test.idempotent_id('65b9ef75-1911-406a-bbdb-ca1d68d528b0')