Use cli.base.execute of tempest-lib

For the change[1] has been merged and released, this work around is
unnecessary.

[1] https://review.openstack.org/#/c/218870/

Change-Id: I9a07a37c5a3a3f61f13fa54fcb1e16852beb2206

aodhclient/tests/functional/base.py

@@ -11,9 +11,6 @@
 #    under the License.
 
 import os
-import shlex
-import six
-import subprocess
 import time
 import uuid
 
@@ -43,34 +40,8 @@ class AodhClient(object):
 
         flags = creds + ' ' + flags
 
-        # FIXME(sileht): base.execute is broken in py3 in tempest-lib
+        return base.execute("aodh", action, flags, params, fail_ok,
-        # see: https://review.openstack.org/#/c/218870/
+                            merge_stderr, self.cli_dir)
-        # return base.execute("aodh", action, flags, params, fail_ok,
-        #                      merge_stderr, self.cli_dir)
-
-        cmd = "aodh"
-
-        # from fixed tempestlib
-        cmd = ' '.join([os.path.join(self.cli_dir, cmd),
-                        flags, action, params])
-        if six.PY2:
-            cmd = cmd.encode('utf-8')
-        cmd = shlex.split(cmd)
-        result = ''
-        result_err = ''
-        stdout = subprocess.PIPE
-        stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
-        proc = subprocess.Popen(cmd, stdout=stdout, stderr=stderr)
-        result, result_err = proc.communicate()
-        if not fail_ok and proc.returncode != 0:
-            raise exceptions.CommandFailed(proc.returncode,
-                                           cmd,
-                                           result,
-                                           result_err)
-        if six.PY2:
-            return result
-        else:
-            return os.fsdecode(result)
 
 
 class ClientTestBase(base.ClientTestBase):

test-requirements.txt

@@ -10,7 +10,7 @@ python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-tempest-lib>=0.6.1
+tempest-lib>=0.9.0  # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0