From b776f7099a93e4b83dc4dbd25686a166a987cfa2 Mon Sep 17 00:00:00 2001 From: Dongcan Ye Date: Wed, 18 Apr 2018 16:51:26 +0000 Subject: [PATCH] Fix functional job failed After Neutron patch I3c93818002c2d7753454547231ba08544b6fa1c0 merged, the default value of segment description is an empty string. This patch will determine whether the Neuron shim extension standard-attr-segment supported. Change-Id: I68a3c018f03e5bb53bd637844ac9d7742a765db0 --- .../network/v2/test_network_segment.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/openstackclient/tests/functional/network/v2/test_network_segment.py b/openstackclient/tests/functional/network/v2/test_network_segment.py index 8940273f8..6ffb11cfc 100644 --- a/openstackclient/tests/functional/network/v2/test_network_segment.py +++ b/openstackclient/tests/functional/network/v2/test_network_segment.py @@ -113,9 +113,20 @@ class NetworkSegmentTests(common.NetworkTests): self.openstack, 'network segment delete ' + name ) - self.assertIsNone( - json_output["description"], - ) + + extension_output = json.loads(self.openstack( + "extension list -f json " + )) + ext_alias = [x["Alias"] for x in extension_output] + if "standard-attr-segment" in ext_alias: + self.assertEqual( + '', + json_output["description"], + ) + else: + self.assertIsNone( + json_output["description"], + ) new_description = 'new_description' cmd_output = self.openstack(