Remove redundant tempest cleanup utility

All the resources including the project, user, network,
images and flavors to enable tempest running, are created
by snaps-OO, which will definitely clean up those finally.

Change-Id: Iea3e3f275cc6cfd2cee421fcafef90aaf2e6cf3e
Signed-off-by: Linda Wang <wangwulin@huawei.com>

2 files changed, 4 insertions, 63 deletions

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index e4062373..f07f59d7 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -227,14 +227,14 @@ def get_ci_envvars():
 
 
 def execute_command_raise(cmd, info=False, error_msg="",
-                          verbose=True, output_file=None, env=None):
-    ret = execute_command(cmd, info, error_msg, verbose, output_file, env)
+                          verbose=True, output_file=None):
+    ret = execute_command(cmd, info, error_msg, verbose, output_file)
     if ret != 0:
         raise Exception(error_msg)
 
 
 def execute_command(cmd, info=False, error_msg="",
-                    verbose=True, output_file=None, env=None):
+                    verbose=True, output_file=None):
     if not error_msg:
         error_msg = ("The command '%s' failed." % cmd)
     msg_exec = ("Executing command: '%s'" % cmd)
@@ -243,7 +243,7 @@ def execute_command(cmd, info=False, error_msg="",
             logger.info(msg_exec)
         else:
             logger.debug(msg_exec)
-    p = subprocess.Popen(cmd, env=env, shell=True, stdout=subprocess.PIPE,
+    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
     if output_file:
         f = open(output_file, "w")
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index def0539b..f211627a 100644
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -1571,62 +1571,3 @@ def get_resource(heat_client, stack_id, resource):
     except Exception as e:
         logger.error("Error [get_resource]: %s" % e)
         return None
-
-
-# *********************************************
-#   TEMPEST
-# *********************************************
-def init_tempest_cleanup(tempest_config_dir=None,
-                         tempest_config_filename='tempest.conf',
-                         output_file=None):
-    """
-    Initialize the Tempest Cleanup utility.
-    See  https://docs.openstack.org/tempest/latest/cleanup.html for docs.
-
-    :param tempest_config_dir: The directory where the Tempest config file is
-            located. If not specified, we let Tempest pick both the directory
-            and the filename (i.e. second parameter is ignored)
-    :param tempest_config_filename: The filename of the Tempest config file
-    :param output_file: Optional file where to save output
-    """
-    # The Tempest cleanup utility currently offers no cmd argument to specify
-    # the config file, therefore it has to be configured with env variables
-    env = None
-    if tempest_config_dir:
-        env = os.environ.copy()
-        env['TEMPEST_CONFIG_DIR'] = tempest_config_dir
-        env['TEMPEST_CONFIG'] = tempest_config_filename
-
-    # If this command fails, an exception must be raised to stop the script
-    # otherwise the later cleanup would destroy also other resources
-    cmd_line = "tempest cleanup --init-saved-state"
-    ft_utils.execute_command_raise(cmd_line, env=env, output_file=output_file,
-                                   error_msg="Tempest cleanup init failed")
-
-
-def perform_tempest_cleanup(tempest_config_dir=None,
-                            tempest_config_filename='tempest.conf',
-                            output_file=None):
-    """
-    Perform cleanup using the Tempest Cleanup utility.
-    See  https://docs.openstack.org/tempest/latest/cleanup.html for docs.
-
-    :param tempest_config_dir: The directory where the Tempest config file is
-            located. If not specified, we let Tempest pick both the directory
-            and the filename (i.e. second parameter is ignored)
-    :param tempest_config_filename: The filename of the Tempest config file
-    :param output_file: Optional file where to save output
-    """
-    # The Tempest cleanup utility currently offers no cmd argument to specify
-    # the config file, therefore it has to be configured with env variables
-    env = None
-    if tempest_config_dir:
-        env = os.environ.copy()
-        env['TEMPEST_CONFIG_DIR'] = tempest_config_dir
-        env['TEMPEST_CONFIG'] = tempest_config_filename
-
-    # If this command fails, an exception must be raised to stop the script
-    # otherwise the later cleanup would destroy also other resources
-    cmd_line = "tempest cleanup"
-    ft_utils.execute_command(cmd_line, env=env, output_file=output_file,
-                             error_msg="Tempest cleanup failed")