diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-11-09 14:21:42 +0100 |
|---|---|---|
| committer | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-11-09 14:21:42 +0100 |
| commit | c7eb260d8b8d8d5e57199a19be348219e9703870 (patch) | |
| tree | 11c0a9320d8dee6d18da3ae227fd0cab69828c1b /rumba/testbeds | |
| parent | bdbd3cbca39de69df0746358b0ac21ed57ba287a (diff) | |
| download | rumba-c7eb260d8b8d8d5e57199a19be348219e9703870.tar.gz rumba-c7eb260d8b8d8d5e57199a19be348219e9703870.zip | |
prototypes: Always parse manifest for hostname
The hostname for wall1 nodes was wrongly constructed. We now parse the
manifest for all testbeds to get the hostname.
Diffstat (limited to 'rumba/testbeds')
| -rw-r--r-- | rumba/testbeds/jfed.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index 6a5c3de..857a3db 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -243,22 +243,13 @@ class Testbed(mod.Testbed): if node_n is None: logger.error("Didn't find node %s", n_name) - hostname = None if "wall" in self.auth_name: - hostname = node_n.name + "." + self.exp_name + "." + \ - auth_name_r + "." + self.auth_name node_n.ssh_config.proxy_server = "bastion.test.iminds.be" - if "cloudlab" in self.auth_name: - hostname = node_n.name + "." + self.exp_name + "." + \ - auth_name_r + "." + self.auth_name + s_node = xml_node.getElementsByTagName("services")[0] + l_node = s_node.getElementsByTagName("login")[0] - if "exogeni" in self.auth_name: - s_node = xml_node.getElementsByTagName("services")[0] - l_node = s_node.getElementsByTagName("login")[0] - hostname = l_node.getAttribute("hostname") - - node_n.ssh_config.hostname = hostname + node_n.ssh_config.hostname = l_node.getAttribute("hostname") for intf in intfs: aux_mac_address = intf.getAttribute("mac_address") |