self.default_boxes = self.plc_boxes + self.qemu_boxes
self.all_boxes = self.build_boxes + [ self.test_box ] + self.plc_boxes + self.qemu_boxes
def __repr__(self):
- return "<Substrate>".format()
+ return "<Substrate {}>".format(self.summary_line())
def summary_line (self):
msg = "["
msg += " {} xp".format(len(self.plc_lxc_boxes))
- msg += " {} tried plc boxes".format(len(self.plc_boxes))
+ msg += " {} xq".format(len(self.qemu_boxes))
msg += "]"
return msg
# essentially generic ..
buildname = buildname
+ # visit the other build's test directory to figure its characteristics
with open ("../{}/arg-fcdistro".format(buildname)) as input:
fcdistro = input.read().strip()
with open ("../{}/arg-pldistro".format(buildname)) as input:
options is a TestMain options
"""
- def __init__(self, test_plc, bonding_spec, options):
+ def __init__(self, test_plc, bonding_spec, substrate, options):
"""
test_plc is one local TestPlc instance
bonding_spec is a dictionary that gives details on
the build we want to be bonding with
"""
+ # the local build & plc is described in options
+ # the bonding build is described in bonding_spec
self.test_plc = test_plc
self.bonding_spec = bonding_spec
+ self.substrate = substrate
self.options = options
- # the local build & plc is described in options
- # the bonding build is described in bonding_spec
-
def nodefamily(self):
return "{pldistro}-{fcdistro}-{arch}".format(**self.bonding_spec)
self.steps_message += 20*'x' + " Macro steps are\n" + \
" ".join(Step.list_macros())
else:
- self.steps_message += 20*'x' + " Default steps with bonding are\n" + \
- TestPlc.printable_steps(TestPlc.bonding_steps)
+ self.steps_message += 20*'x' + " Default steps with bonding build are\n" + \
+ TestPlc.printable_steps(TestPlc.default_bonding_steps)
def list_steps(self):
if not self.options.verbose:
if not self.options.steps:
# defaults, depends on using bonding or not
if self.options.bonding:
- self.options.steps = TestPlc.bonding_steps
+ self.options.steps = TestPlc.default_bonding_steps
else:
self.options.steps = TestPlc.default_steps
for spec, test_plc in all_plcs:
test_plc.test_bonding = TestBonding (test_plc,
onelab_bonding_spec(self.options.bonding),
+ LocalSubstrate.local_substrate,
self.options)
overall_result = 'SUCCESS'
'debug_nodemanager', 'slice_fs_present', SEP,
'standby_1_through_20','yes','no',SEP,
]
- bonding_steps = [
+ default_bonding_steps = [
'bonding_init_partial',
'bonding_add_yum',
'bonding_install_rpms', SEP,