commit b541c28bec3d4cbf1ac062c4c888cc28fef935cc
author Jenkins <jenkins@review.openstack.org> Sat Jul 30 00:55:22 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jul 30 00:55:22 2016 +0000
tree fc778a5372ac328f3cf02d287404bbd838e94a4a
parent 3b374fded212665cdf7d51fd9c932469869e8d4c
parent 6990d42d2ae4cf14476631050206265c59692ff9

Merge "Use api_extensions to decide security_group type nova used"

tempest/api/compute/security_groups/test_security_groups_negative.py

diff --git a/tempest/api/compute/security_groups/test_security_groups_negative.py b/tempest/api/compute/security_groups/test_security_groups_negative.py
index 5125e2b..e6abf28 100644
--- a/tempest/api/compute/security_groups/test_security_groups_negative.py
+++ b/tempest/api/compute/security_groups/test_security_groups_negative.py
@@ -44,9 +44,11 @@
             security_group_id.append(body[i]['id'])
         # Generate a non-existent security group id
         while True:
-            non_exist_id = data_utils.rand_int_id(start=999)
-            if self.neutron_available:
+            if (self.neutron_available and
+                test.is_extension_enabled('security-group', 'network')):
                 non_exist_id = data_utils.rand_uuid()
+            else:
+                non_exist_id = data_utils.rand_int_id(start=999)
             if non_exist_id not in security_group_id:
                 break
         return non_exist_id