diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-11 19:12:53 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-11 19:12:53 +0200 |
| commit | f5f9fba3d6b657fd5daa31e4981c055a05c596e8 (patch) | |
| tree | def87ce8de8656f07cf9f79b209d794f5414b0c1 /rumba/testbeds/qemu.py | |
| parent | 662c33bf7ce9ddf3bcc77f7d5f51c958d2b837ad (diff) | |
| download | rumba-f5f9fba3d6b657fd5daa31e4981c055a05c596e8.tar.gz rumba-f5f9fba3d6b657fd5daa31e4981c055a05c596e8.zip | |
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.
Diffstat (limited to 'rumba/testbeds/qemu.py')
| -rw-r--r-- | rumba/testbeds/qemu.py | 4 |
1 files changed, 3 insertions, 1 deletions
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, |