X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/68289c75642bad558f344bdd13b357af781fbe8b..a10caf87a59b8ad16b9d234bc9b0175dfe6f0c5a:/qa/qa_rapi.py

diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index 7c668c5..da7f90d 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -43,7 +43,7 @@ NoProxyOpener = urllib2.build_opener(urllib2.ProxyHandler({}))
 INSTANCE_FIELDS = ("name", "os", "pnode", "snodes",
                    "admin_state",
                    "disk_template", "disk.sizes",
-                   "nic.ips", "nic.macs", "nic.bridges",
+                   "nic.ips", "nic.macs", "nic.modes", "nic.links",
                    "beparams", "hvparams",
                    "oper_state", "oper_ram", "status", "tags")
 
@@ -58,25 +58,13 @@ 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):
   master = qa_config.GetMasterNode()
   host = master["primary"]
-  port = qa_config.get("rapi-port", default=constants.RAPI_PORT)
+  port = qa_config.get("rapi-port", default=constants.DEFAULT_RAPI_PORT)
 
   for uri, verify in uris:
     assert uri.startswith("/")