Revision 301adaae qa/qa_rapi.py

b/qa/qa_rapi.py
88 88
  cfg_curl = rapi.client.GenericCurlConfig(cafile=_rapi_ca.name,
89 89
                                           proxy="")
90 90

  
91
  _rapi_client = rapi.client.GanetiRapiClient(master.primary, port=port,
92
                                              username=username,
93
                                              password=password,
94
                                              curl_config_fn=cfg_curl)
91
  if qa_config.UseVirtualCluster():
92
    # TODO: Implement full support for RAPI on virtual clusters
93
    print qa_utils.FormatWarning("RAPI tests are not yet supported on"
94
                                 " virtual clusters and will be disabled")
95 95

  
96
  print "RAPI protocol version: %s" % _rapi_client.GetVersion()
96
    assert _rapi_client is None
97
  else:
98
    _rapi_client = rapi.client.GanetiRapiClient(master.primary, port=port,
99
                                                username=username,
100
                                                password=password,
101
                                                curl_config_fn=cfg_curl)
102

  
103
    print "RAPI protocol version: %s" % _rapi_client.GetVersion()
97 104

  
98 105

  
99 106
INSTANCE_FIELDS = ("name", "os", "pnode", "snodes",
......
126 133
  """Return whether remote API tests should be run.
127 134

  
128 135
  """
129
  return qa_config.TestEnabled("rapi")
136
  # TODO: Implement RAPI tests for virtual clusters
137
  return (qa_config.TestEnabled("rapi") and
138
          not qa_config.UseVirtualCluster())
130 139

  
131 140

  
132 141
def _DoTests(uris):

Also available in: Unified diff