)
p.set_defaults (run=run)
-def run (c, args, nodes):
- running, _ = lib.get_all_guests (c, nodes.values ())
+def run (c, args):
+ running, _ = lib.get_all_guests (c)
m = re.match (r'^(.*):(.*)$', args.vm)
- node_name = None
if m:
# We don't actually care about the node, but we check it
# is the expected one below.
- node_name = m.group (1)
+ node_name_check = m.group (1)
vm_name = m.group (2)
else:
+ node_name_check = None
vm_name = args.vm
if vm_name not in running:
sys.exit ("error: vm %s not found or not running" % vm_name)
- dom = running[vm_name]['dom']
- node = running[vm_name]['node']
+ vm = running[vm_name]['vm']
+ node_name = running[vm_name]['node']
- if node_name and node.name != node_name:
+ if node_name_check and node_name != node_name_check:
sys.exit ("error: vm %s is not running on node %s, did you mean %s:%s ?" %
- (vm_name, node_name, node.name, vm_name))
+ (vm_name, node_name_check, node_name, vm_name))
# Run the virsh console command.
- subprocess.call ([config.VIRT_VIEWER, "-c", node.uri, vm_name])
+ subprocess.call ([config.VIRT_VIEWER,
+ "-c", lib.uri_of_node (node_name),
+ vm_name])