From f5f9fba3d6b657fd5daa31e4981c055a05c596e8 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 11 Apr 2017 19:12:53 +0200 Subject: ssh_support: Pass SSHConfig instead of only hostname Only the hostname was passed to the ssh_support component. This passes an object that can also hold the port number. It can be extended to take other things as well, such as a proxy. --- rumba/testbeds/qemu.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'rumba/testbeds/qemu.py') diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index 1c5d486..b42cf5d 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -165,13 +165,15 @@ class Testbed(mod.Testbed): vmid = 1 for node in experiment.nodes: - name = node.full_name + name = node.name vm = self.vms.setdefault(name, {'vm': node, 'ports': []}) fwdp = base_port + vmid fwdc = fwdp + 10000 mac = '00:0a:0a:0a:%02x:%02x' % (vmid, 99) vm['ssh'] = fwdp vm['id'] = vmid + node.ssh_config.hostname = "localhost" + node.ssh_config.port = fwdp vars_dict = {'fwdp': fwdp, 'id': vmid, 'mac': mac, 'bzimage': self.bzimage, -- cgit v1.2.3