Merge "ci in huawei-pod1 do not run test case after tc074"

[yardstick.git] / yardstick / common / utils.py

diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py
index 3ecb0ae..3c5895f 100644 (file)
--- a/yardstick/common/utils.py
+++ b/yardstick/common/utils.py
@@ -15,17 +15,19 @@
 
 # yardstick comment: this is a modified copy of rally/rally/common/utils.py
 
-import os
-import sys
-import yaml
+from __future__ import absolute_import
+from __future__ import print_function
+
 import errno
-import subprocess
 import logging
+import os
+import subprocess
+import sys
+from functools import reduce
 
+import yaml
 from oslo_utils import importutils
-from keystoneauth1 import identity
-from keystoneauth1 import session
-from neutronclient.v2_0 import client
+from oslo_serialization import jsonutils
 
 import yardstick
 
@@ -94,12 +96,12 @@ def get_para_from_yaml(file_path, args):
             value = reduce(func, args.split('.'), value)
 
             if value is None:
-                print 'parameter not found'
+                print('parameter not found')
                 return None
 
             return value
     else:
-        print 'file not exist'
+        print('file not exist')
         return None
 
 
@@ -129,15 +131,16 @@ def source_env(env_file):
     return env
 
 
-def get_openstack_session():
-    auth = identity.Password(auth_url=os.environ.get('OS_AUTH_URL'),
-                             username=os.environ.get('OS_USERNAME'),
-                             password=os.environ.get('OS_PASSWORD'),
-                             tenant_name=os.environ.get('OS_TENANT_NAME'))
-    return session.Session(auth=auth)
+def read_json_from_file(path):
+    with open(path, 'r') as f:
+        return jsonutils.load(f)
+
+
+def write_json_to_file(path, data, mode='w'):
+    with open(path, mode) as f:
+        jsonutils.dump(data, f)
 
 
-def get_neutron_client():
-    sess = get_openstack_session()
-    neutron_client = client.Client(session=sess)
-    return neutron_client
+def write_file(path, data, mode='w'):
+    with open(path, mode) as f:
+        f.write(data)