Commit e1876432 authored by Guido Trotter's avatar Guido Trotter

Get rid of constants.RAPI_ENABLE

This constant is unused, except in qa. Removing it since it's always True.

This patch also removes the unused qa_rapi.PrintRemoteAPIWarning
function, and removes a comment about temporary constants "until we have
cluster parameters".
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 68b1fcd5
......@@ -472,8 +472,6 @@ OPS_FINALIZED = frozenset([OP_STATUS_CANCELED,
ELOG_MESSAGE = "message"
ELOG_PROGRESS = "progress"
# Temporary RAPI constants until we have cluster parameters
RAPI_ENABLE = True
RAPI_PORT = 5080
# max dynamic devices
......
......@@ -58,19 +58,7 @@ def Enabled():
"""Return whether remote API tests should be run.
"""
return constants.RAPI_ENABLE and qa_config.TestEnabled('rapi')
def PrintRemoteAPIWarning():
"""Print warning if remote API is not enabled.
"""
if constants.RAPI_ENABLE or not qa_config.TestEnabled('rapi'):
return
msg = ("Remote API is not enabled in this Ganeti build. Please run"
" `configure [...] --enable-rapi'.")
print
print qa_utils.FormatWarning(msg)
return qa_config.TestEnabled('rapi')
def _DoTests(uris):
......
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