['ganeti-noded', '--version'],
['ganeti-watcher', '--version'] )
- cmd = ' && '.join(map(utils.ShellQuoteArgs, cmds))
+ cmd = ' && '.join([utils.ShellQuoteArgs(i) for i in cmds])
for node in cfg['nodes']:
AssertEqual(StartSSH(node['primary'], cmd).wait(), 0)
check.append(i['secondary'])
ping = lambda ip: utils.ShellQuoteArgs(['ping', '-w', '3', '-c', '1', ip])
- cmd = ' && '.join(map(ping, check))
+ cmd = ' && '.join([ping(i) for i in check])
AssertEqual(StartSSH(node['primary'], cmd).wait(), 0)
# }}}
cmd.append('--secondary-ip=%s' % master['secondary'])
if cfg.get('bridge', None):
cmd.append('--bridge=%s' % cfg['bridge'])
+ cmd.append('--master-netdev=%s' % cfg['bridge'])
cmd.append(cfg['name'])
AssertEqual(StartSSH(master['primary'],
script = UploadFile(master['primary'], '../tools/burnin')
try:
cmd = [script, '--os=%s' % cfg['os']]
- cmd += map(lambda inst: inst['name'], instances)
+ cmd += [inst['name'] for inst in instances]
AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
finally:
for node in cfg['nodes']:
if node != master:
_NodeRemove(node)
+
+
+def TestNodeInfo():
+ """gnt-node info"""
+ cmd = ['gnt-node', 'info']
+ AssertEqual(StartSSH(GetMasterNode()['primary'],
+ utils.ShellQuoteArgs(cmd)).wait(), 0)
# }}}
# {{{ Instance tests
cmd = ['gnt-instance', 'failover', '--force', instance['name']]
AssertEqual(StartSSH(GetMasterNode()['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
+
+
+def TestInstanceInfo(instance):
+ """gnt-instance info"""
+ cmd = ['gnt-instance', 'info', instance['name']]
+ AssertEqual(StartSSH(GetMasterNode()['primary'],
+ utils.ShellQuoteArgs(cmd)).wait(), 0)
# }}}
# {{{ Daemon tests
if TestEnabled('cluster-verify'):
RunTest(TestClusterVerify)
+
+ if TestEnabled('cluster-info'):
RunTest(TestClusterInfo)
RunTest(TestNodeAddAll)
+ if TestEnabled('node-info'):
+ RunTest(TestNodeInfo)
+
if TestEnabled('cluster-burnin'):
RunTest(TestClusterBurnin)
RunTest(TestInstanceShutdown, instance)
RunTest(TestInstanceStartup, instance)
+ if TestEnabled('instance-info'):
+ RunTest(TestInstanceInfo, instance)
+
if TestEnabled('instance-automatic-restart'):
RunTest(TestInstanceAutomaticRestart, node, instance)
instance = RunTest(TestInstanceAddWithLocalMirrorDisk, node)
RunTest(TestInstanceShutdown, instance)
RunTest(TestInstanceStartup, instance)
+
+ if TestEnabled('instance-info'):
+ RunTest(TestInstanceInfo, instance)
+
RunTest(TestInstanceRemove, instance)
del instance
RunTest(TestInstanceShutdown, instance)
RunTest(TestInstanceStartup, instance)
+ if TestEnabled('instance-info'):
+ RunTest(TestInstanceInfo, instance)
+
if TestEnabled('instance-failover'):
RunTest(TestInstanceFailover, instance)