From cc6c27b185ae77e4d214c431a28475bbf66899ef Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 7 Feb 2018 13:50:33 +0100 Subject: testbeds: Fix local message in jFed testbed Setting the locale sometimes prevented the warning being shown. This disables the warning alltogether. --- rumba/testbeds/jfed.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'rumba/testbeds/jfed.py') diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index 94a06e5..5fdde99 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -269,6 +269,11 @@ class Testbed(mod.Testbed): node_n.ssh_config, "sudo locale-gen en_US.UTF-8 || true") + ssh_support.execute_command( + self, + node_n.ssh_config, + "sudo touch /var/lib/cloud/instance/locale-check.skip || true") + for intf in intfs: aux_mac_address = intf.getAttribute("mac_address") @@ -300,9 +305,9 @@ class Testbed(mod.Testbed): if self.if_id[ipcp] == i_name: ipcp.ifname = ifname if ifname is None or ifname == "": - logger.error("Could not determine name of node" - "%s interface %s" - % (node_n.name, mac)) + raise Exception("Could not determine name of " + "node %s interface %s" + % (node_n.name, mac)) else: logger.debug("Node %s interface %s has name %s." % (node_n.name, mac, ifname)) -- cgit v1.2.3