commit 543ed088258529e3b567eb3778117eda59df88d8
author Jenkins <jenkins@review.openstack.org> Thu May 25 02:30:52 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 25 02:30:52 2017 +0000
tree 728e96be4df06c708e475e9f7c97cd248ccaf2c1
parent d2c0394cc079b0cd72f6f065adbe2724d7abe61b
parent cf999a83f07158c1bf5c21efeafba4051f34b490

Merge "cls.os is deprecated use cls.os_primary"

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index e8108f4..f07c071 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -373,9 +373,9 @@
     @classmethod
     def resource_setup(cls):
         """Class level resource setup for test cases."""
-        if hasattr(cls, "os"):
+        if hasattr(cls, "os_primary"):
             cls.validation_resources = vresources.create_validation_resources(
-                cls.os, cls.validation_resources)
+                cls.os_primary, cls.validation_resources)
         else:
             LOG.warning("Client manager not found, validation resources not"
                         " created")
@@ -388,8 +388,8 @@
         resources, in case a failure during `resource_setup` should happen.
         """
         if cls.validation_resources:
-            if hasattr(cls, "os"):
-                vresources.clear_validation_resources(cls.os,
+            if hasattr(cls, "os_primary"):
+                vresources.clear_validation_resources(cls.os_primary,
                                                       cls.validation_resources)
                 cls.validation_resources = {}
             else: