Merge "Inherit segmentation details for trunk subports if requested"
diff --git a/neutron/tests/tempest/api/test_qos.py b/neutron/tests/tempest/api/test_qos.py
index 4f03557..184c092 100644
--- a/neutron/tests/tempest/api/test_qos.py
+++ b/neutron/tests/tempest/api/test_qos.py
@@ -177,8 +177,8 @@
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'])
@decorators.idempotent_id('65b9ef75-1911-406a-bbdb-ca1d68d528b0')
diff --git a/neutron/tests/tempest/api/test_timestamp.py b/neutron/tests/tempest/api/test_timestamp.py
index 2abef94..8b57b2d 100644
--- a/neutron/tests/tempest/api/test_timestamp.py
+++ b/neutron/tests/tempest/api/test_timestamp.py
@@ -223,8 +223,10 @@
# verify the timestamp from creation and showed is same
self.assertEqual(router['created_at'],
show_router['created_at'])
- self.assertEqual(router['updated_at'],
- show_router['updated_at'])
+ # 'updated_at' timestamp can change immediately after creation
+ # if environment is HA or DVR, so just make sure it's >=
+ self.assertGreaterEqual(show_router['updated_at'],
+ router['updated_at'])
@decorators.idempotent_id('8ae55186-464f-4b87-1c9f-eb2765ee81ac')
def test_create_floatingip_with_timestamp(self):