On Mon, May 13, 2013 at 8:18 PM, Guido Trotter <[email protected]> wrote:
> > > > On Mon, May 13, 2013 at 7:14 PM, Michele Tartara <[email protected]>wrote: > >> The QA tests the Xen instance status collector, but that is expected to >> fail >> when run on machines that do not use Xen. >> >> Signed-off-by: Michele Tartara <[email protected]> >> --- >> qa/qa_monitoring.py | 28 +++++++++++++++++++++++++--- >> 1 file changed, 25 insertions(+), 3 deletions(-) >> >> diff --git a/qa/qa_monitoring.py b/qa/qa_monitoring.py >> index d6a2709..97c0c02 100644 >> --- a/qa/qa_monitoring.py >> +++ b/qa/qa_monitoring.py >> @@ -24,8 +24,12 @@ >> """ >> >> from ganeti import _autoconf >> +from ganeti import constants >> +from ganeti import pathutils >> +from ganeti import utils >> >> import qa_config >> +import qa_utils >> >> from qa_utils import AssertCommand >> from qa_instance_utils import CreateInstanceByDiskTemplate, \ >> @@ -33,13 +37,31 @@ from qa_instance_utils import >> CreateInstanceByDiskTemplate, \ >> >> MON_COLLECTOR = _autoconf.PKGLIBDIR + "/mon-collector" >> >> +def _ReadSsconfHypervisorList(): >> + """Reads ssconf_hypervisor_list from the master node. >> + >> + """ >> + master = qa_config.GetMasterNode() >> + >> + ssconf_path = utils.PathJoin(pathutils.DATA_DIR, >> + "ssconf_%s" % >> constants.SS_HYPERVISOR_LIST) >> + >> > > Shouldn't we get that from the qa config, rather than sshing on the > cluster to read it? > I didn't know it was there as well, thanks for pointing it out. I'll modify it. Thanks, Michele
