openstack
/
dragonflow
Code Issues Proposed changes

Gate fix: Correct expected revision number 

In [1], Neutron updated the way revision numbers are updated to be more
precise, which also changed their initial values in some cases. In
Dragonflow tests we assume some things about these values. This change
updates these assumptions.

A more long-term fix may be to remove these assumptions, but seeing as
this is a gate-fix, thie long-term solution is postponed.

[1] https://review.openstack.org/#/c/475646/

Change-Id: Ic71c158c2feee2281d9d9002c5b80f338024fee3
This commit is contained in:
Omer Anson 2017-06-27 08:27:07 +03:00
parent 18b8983153
commit b212a48877
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dragonflow/tests/unit/test_df_qos_driver.py
View File

@ -49,7 +49,7 @@ class TestDfQosDriver(test_mech_driver.DFMechanismDriverTestCase):
def _test_create_policy(self):
qos_policy = {'policy': {'name': "policy1", 'project_id': 'project1'}}
qos_obj = self.qos_plugin.create_policy(self.context, qos_policy)
self.assertGreater(qos_obj['revision_number'], 0)
self.assertEqual(qos_obj['revision_number'], 0)
self.qos_driver.nb_api.create.assert_called_with(qos.QosPolicy(
id=qos_obj['id'],
topic='project1',

4
dragonflow/tests/unit/test_l3_router_plugin.py
View File

@ -75,7 +75,7 @@ class TestDFL3RouterPlugin(test_mech_driver.DFMechanismDriverTestCase):
r = {'router': {'name': 'router', 'tenant_id': 'tenant',
'admin_state_up': True}}
router = self.l3p.create_router(self.context, r)
self.assertGreater(router['revision_number'], 0)
self.assertEqual(router['revision_number'], 0)
lrouter = neutron_l3.logical_router_from_neutron_router(router)
self.nb_api.create.assert_called_once_with(lrouter)
@ -133,7 +133,7 @@ class TestDFL3RouterPlugin(test_mech_driver.DFMechanismDriverTestCase):
self.context,
{'floatingip': {'floating_network_id': n['network']['id'],
'tenant_id': n['network']['tenant_id']}})
self.assertGreater(floatingip['revision_number'], 0)
self.assertEqual(floatingip['revision_number'], 0)
nb_fip = self.nb_api.create.call_args_list[-1][0][0]
self.assertIsInstance(nb_fip, df_l3.FloatingIp)
self.assertEqual(floatingip['id'], nb_fip.id)