Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding 2 node ixia generic scale-out test case generation"
[yardstick.git]
/
yardstick
/
common
/
utils.py
diff --git
a/yardstick/common/utils.py
b/yardstick/common/utils.py
index
68c9ed6
..
6ac99a5
100644
(file)
--- a/
yardstick/common/utils.py
+++ b/
yardstick/common/utils.py
@@
-37,7
+37,6
@@
from oslo_utils import importutils
from oslo_serialization import jsonutils
import yardstick
from oslo_serialization import jsonutils
import yardstick
-from yardstick.common.yaml_loader import yaml_load
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
@@
-94,19
+93,6
@@
def import_modules_from_package(package):
logger.exception("unable to import %s", module_name)
logger.exception("unable to import %s", module_name)
-def parse_yaml(file_path):
- try:
- with open(file_path) as f:
- value = yaml_load(f)
- except IOError:
- return {}
- except OSError as e:
- if e.errno != errno.EEXIST:
- raise
- else:
- return value
-
-
def makedirs(d):
try:
os.makedirs(d)
def makedirs(d):
try:
os.makedirs(d)