From: Alina Quereilhac Date: Wed, 21 Jan 2015 19:14:55 +0000 (+0100) Subject: nitos omf6 ping updated X-Git-Tag: nepi-3.2.0~12 X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=0933e2711c57a658305f36301a4a894a195d8750 nitos omf6 ping updated --- diff --git a/examples/omf/nitos_omf6_ping.py b/examples/omf/nitos_omf6_ping.py index 5623a0ea..42322007 100644 --- a/examples/omf/nitos_omf6_ping.py +++ b/examples/omf/nitos_omf6_ping.py @@ -52,37 +52,47 @@ from nepi.execution.resource import ResourceAction, ResourceState from optparse import OptionParser import os -usage = ("usage: %prog -x -z -s -c ") +usage = ("usage: %prog -x -y -c -u -g ") parser = OptionParser(usage = usage) parser.add_option("-x", "--nodex", dest="nodex", help="Nitos first reserved node " - "(e.g. hostname must be of form: node0XX)", + "(e.g. hostname must be of form: omf.nitos.node0XX)", type="str") -parser.add_option("-z", "--nodez", dest="nodez", +parser.add_option("-y", "--nodey", dest="nodey", help="Nitos second reserved node " - "(e.g. hostname must be of form: node0ZZ)", + "(e.g. hostname must be of form: omf.nitos.node0YY)", type="str") parser.add_option("-c", "--channel", dest="channel", help="Nitos reserved channel", type="str") -parser.add_option("-s", "--slice-name", dest="slicename", - help="Nitos slice name", type="str") +parser.add_option("-g", "--gateway", dest="gateway", + help="Nitos gateway hostname", + type="str", default="nitlab.inf.uth.gr") +parser.add_option("-u", "--slicename", dest="slicename", + help="Nitos gateway username (slicename)", + type="str") + (options, args) = parser.parse_args() -nodex = options.nodex -nodez = options.nodez +if not options.channel or not options.nodex or \ + not options.nodey or not options.slicename: + parser.error("Missing argument channel, nodex, nodey, or slicename!") + +nodex = options.nodex.split(".")[-1] +nodey = options.nodey.split(".")[-1] slicename = options.slicename chan = options.channel +gateway = options.gateway # Create the EC -ec = ExperimentController(exp_id="nitos_omf6_ping") +ec = ExperimentController(exp_id="nitos_omf6_ping2") # Create and Configure the Nodes node1 = ec.register_resource("omf::Node") ec.set(node1, "hostname", nodex) ec.set(node1, "xmppUser", slicename) -ec.set(node1, "xmppServer", "nitlab.inf.uth.gr") +ec.set(node1, "xmppServer", gateway) ec.set(node1, "xmppPort", "5222") ec.set(node1, "xmppPassword", "1234") @@ -97,9 +107,9 @@ ec.register_connection(node1, iface1) # Create and Configure the Nodes node2 = ec.register_resource("omf::Node") -ec.set(node2, "hostname", nodez) +ec.set(node2, "hostname", nodey) ec.set(node2, "xmppUser", slicename) -ec.set(node2, "xmppServer", "nitlab.inf.uth.gr") +ec.set(node2, "xmppServer", gateway) ec.set(node2, "xmppPort", "5222") ec.set(node2, "xmppPassword", "1234") @@ -109,14 +119,14 @@ ec.set(iface2, "name", "wlan0") ec.set(iface2, "mode", "adhoc") ec.set(iface2, "hw_mode", "g") ec.set(iface2, "essid", "ping") -ec.set(iface2, "ip", "192.168.0.%s/24" % nodez[-2:]) +ec.set(iface2, "ip", "192.168.0.%s/24" % nodey[-2:]) ec.register_connection(node2, iface2) # Create and Configure the Channel channel = ec.register_resource("omf::Channel") ec.set(channel, "channel", chan) ec.set(channel, "xmppUser", slicename) -ec.set(channel, "xmppServer", "nitlab.inf.uth.gr") +ec.set(channel, "xmppServer", gateway) ec.set(channel, "xmppPort", "5222") ec.set(channel, "xmppPassword", "1234") ec.register_connection(iface1, channel) @@ -125,7 +135,7 @@ ec.register_connection(iface2, channel) # Create and Configure the PING Application app1 = ec.register_resource("omf::Application") ec.set(app1, "appid", "Ping#1") -ec.set(app1, "command", "/bin/ping -c3 192.168.0.%s" % nodez[-2:]) +ec.set(app1, "command", "/bin/ping -c3 192.168.0.%s" % nodey[-2:]) ec.register_connection(app1, node1) ## Make sure the ping stops after 30 seconds diff --git a/examples/omf/nitos_testbed_bootstrap.py b/examples/omf/nitos_testbed_bootstrap.py index 34d2e3f8..26e87743 100644 --- a/examples/omf/nitos_testbed_bootstrap.py +++ b/examples/omf/nitos_testbed_bootstrap.py @@ -36,19 +36,19 @@ from nepi.execution.resource import ResourceAction, ResourceState from optparse import OptionParser import os -usage = ("usage: %prog -H -u -i -g -U ") +usage = ("usage: %prog -H -U -i -g -u ") parser = OptionParser(usage = usage) parser.add_option("-H", "--hosts", dest="hosts", help="Space separated list of hosts", type="str") -parser.add_option("-u", "--username", dest="username", +parser.add_option("-U", "--username", dest="username", help="Username for the nitos hosts (usually root)", type="str", default="root" ) parser.add_option("-g", "--gateway", dest="gateway", help="Nitos gateway hostname", type="str", default="nitlab.inf.uth.gr") -parser.add_option("-U", "--gateway-user", dest="gateway_username", - help="Nitos gateway username", +parser.add_option("-u", "--gateway-user", dest="gateway_username", + help="Nitos gateway username (slicename)", type="str", default="nitlab.inf.uth.gr") parser.add_option("-i", "--ssh-key", dest="ssh_key", help="Path to private SSH key to be used for connection", diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py index 0bef4ada..8c5a6c5c 100644 --- a/src/nepi/resources/linux/node.py +++ b/src/nepi/resources/linux/node.py @@ -369,11 +369,11 @@ class LinuxNode(ResourceManager): if not self.get("ip"): try: ip = sshfuncs.gethostbyname(self.get("hostname")) + self.set("ip", ip) except: - msg = "DNS can not resolve hostname %s" % self.get("hostname") - self.debug(msg) + msg = "Local DNS can not resolve hostname %s" % self.get("hostname") + self.error(msg) - self.set("ip", ip) super(LinuxNode, self).do_provision()