Commit a59c31ca authored by Helga Velroyen's avatar Helga Velroyen
Browse files

noded.py: remove fallback of 'node_info'



In order to change backend and frontend code of the RPC
call 'node_info' in separate patches, we included a
fallback to the old implementation. Since all RPC callers
are adjusted, this can be removed now.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parent da803ff1
......@@ -724,26 +724,9 @@ class NodeRequestHandler(http.server.HttpServerHandler):
"""Query node information.
"""
# FIXME: remove the fallback to excl_stor once all callers are
# adjusted
if (len(params) == 3):
(legacy_storage_units, hv_specs, excl_stor) = params
storage_units = NodeRequestHandler._ConvertExclStorage(
legacy_storage_units, excl_stor)
else:
(storage_units, hv_specs) = params
(storage_units, hv_specs) = params
return backend.GetNodeInfo(storage_units, hv_specs)
@staticmethod
def _ConvertExclStorage(storage_units, excl_stor):
result_units = []
for (storage_type, storage_key) in storage_units:
if storage_type in [constants.ST_LVM_VG, constants.ST_LVM_PV]:
result_units.append((storage_type, storage_key, [excl_stor]))
else:
result_units.append((storage_type, storage_key, []))
return result_units
@staticmethod
def perspective_etc_hosts_modify(params):
"""Modify a node entry in /etc/hosts.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment