Merge "Use project_id instead of tenant_id in qos notification"
This commit is contained in:
commit
013b7e34fb
@ -43,7 +43,7 @@ class DFQosServiceNotificationDriver(
|
||||
@lock_db.wrap_db_lock(lock_db.RESOURCE_QOS)
|
||||
def create_policy(self, context, policy):
|
||||
self.nb_api.create_qos_policy(policy['id'],
|
||||
policy['tenant_id'],
|
||||
policy['project_id'],
|
||||
name=policy['name'],
|
||||
rules=policy.get('rules', []),
|
||||
version=policy['revision_number'])
|
||||
@ -56,7 +56,7 @@ class DFQosServiceNotificationDriver(
|
||||
policy_neutron = self._plugin.get_policy(context, policy_id)
|
||||
|
||||
self.nb_api.update_qos_policy(
|
||||
policy_id, policy_neutron['tenant_id'],
|
||||
policy_id, policy['project_id'],
|
||||
name=policy['name'], rules=policy_neutron['rules'],
|
||||
version=policy_neutron['revision_number'])
|
||||
|
||||
|
@ -41,11 +41,11 @@ class TestDFQosNotificationDriver(test_mech_driver.DFMechanismDriverTestCase):
|
||||
self.plugin.notification_driver_manager.notification_drivers[0])
|
||||
|
||||
def _test_create_policy(self):
|
||||
qos_policy = {'policy': {'name': "policy1", 'tenant_id': "tenant1"}}
|
||||
qos_policy = {'policy': {'name': "policy1", 'project_id': 'project1'}}
|
||||
qos_obj = self.plugin.create_policy(self.context, qos_policy)
|
||||
self.assertGreater(qos_obj['revision_number'], 0)
|
||||
self.driver.nb_api.create_qos_policy.assert_called_with(
|
||||
mock.ANY, 'tenant1', name='policy1',
|
||||
mock.ANY, 'project1', name='policy1',
|
||||
rules=[], version=qos_obj['revision_number'])
|
||||
return qos_obj
|
||||
|
||||
@ -59,7 +59,7 @@ class TestDFQosNotificationDriver(test_mech_driver.DFMechanismDriverTestCase):
|
||||
self.assertGreater(new_qos_obj['revision_number'],
|
||||
qos_obj['revision_number'])
|
||||
self.driver.nb_api.update_qos_policy.assert_called_with(
|
||||
qos_obj['id'], 'tenant1', name='policy2',
|
||||
qos_obj['id'], 'project1', name='policy2',
|
||||
rules=[], version=new_qos_obj['revision_number'])
|
||||
|
||||
def test_create_delete_policy_rule(self):
|
||||
@ -73,7 +73,7 @@ class TestDFQosNotificationDriver(test_mech_driver.DFMechanismDriverTestCase):
|
||||
self.assertGreater(new_qos_obj['revision_number'],
|
||||
qos_obj['revision_number'])
|
||||
self.driver.nb_api.update_qos_policy.assert_called_with(
|
||||
qos_obj['id'], 'tenant1', name='policy1',
|
||||
qos_obj['id'], 'project1', name='policy1',
|
||||
rules=[qos_rule_obj], version=new_qos_obj['revision_number'])
|
||||
|
||||
self.plugin.delete_policy_rule(self.context,
|
||||
@ -84,7 +84,7 @@ class TestDFQosNotificationDriver(test_mech_driver.DFMechanismDriverTestCase):
|
||||
self.assertGreater(newer_qos_obj['revision_number'],
|
||||
new_qos_obj['revision_number'])
|
||||
self.driver.nb_api.update_qos_policy.assert_called_with(
|
||||
qos_obj['id'], 'tenant1', name='policy1',
|
||||
qos_obj['id'], 'project1', name='policy1',
|
||||
rules=[], version=newer_qos_obj['revision_number'])
|
||||
|
||||
def test_delete_policy(self):
|
||||
|
Loading…
Reference in New Issue
Block a user