large refactoring of new code
diff --git a/nodes/fuel.py b/nodes/fuel.py
index c828793..25476dc 100644
--- a/nodes/fuel.py
+++ b/nodes/fuel.py
@@ -1,6 +1,9 @@
+import logging
+
+
import node
import fuel_rest_api
-import logging
+from disk_perf_test_tool.utils import parse_creds
logger = logging.getLogger("io-perf-tool")
@@ -8,10 +11,18 @@
def discover_fuel_nodes(root_url, credentials, roles):
"""Discover Fuel nodes"""
- connection = fuel_rest_api.KeystoneAuth(root_url, credentials)
+ user, passwd, tenant = parse_creds(credentials['creds'])
+
+ creds = dict(
+ username=user,
+ password=passwd,
+ tenant_name=tenant,
+ )
+
+ connection = fuel_rest_api.KeystoneAuth(root_url, creds)
fi = fuel_rest_api.FuelInfo(connection)
nodes = []
for role in roles:
nodes.extend(getattr(fi.nodes, role))
logger.debug("Found %s fuel nodes" % len(fi.nodes))
- return [node.Node(n.ip, n.get_roles()) for n in nodes]
\ No newline at end of file
+ return [node.Node(n.ip, n.get_roles()) for n in nodes]