import os
import time
-# TODO: - routes!!!
+# TODO:
# - CREATE GRE - PlanetlabGRE - it only needs to set the gre and remote
# properties when configuring the vif_up
@classmethod
def _register_attributes(cls):
ip4 = Attribute("ip4", "IPv4 Address",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
mac = Attribute("mac", "MAC Address",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
prefix4 = Attribute("prefix4", "IPv4 network prefix",
type = Types.Integer,
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
mtu = Attribute("mtu", "Maximum transmition unit for device",
type = Types.Integer)
devname = Attribute("deviceName",
"Name of the network interface (e.g. eth0, wlan0, etc)",
- flags = Flags.ReadOnly)
+ flags = Flags.NoWrite)
up = Attribute("up", "Link up",
type = Types.Bool)
snat = Attribute("snat", "Set SNAT=1",
type = Types.Bool,
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
pointopoint = Attribute("pointopoint", "Peer IP address",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
tear_down = Attribute("tearDown", "Bash script to be executed before " + \
"releasing the resource",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
cls._register_attribute(ip4)
cls._register_attribute(mac)
@property
def node(self):
- node = self.get_connected(PlanetlabNode.rtype())
+ node = self.get_connected(PlanetlabNode.get_rtype())
if node: return node[0]
return None
stop_command = self.replace_paths(self._stop_command)
self.node.upload(stop_command,
os.path.join(self.app_home, "stop.sh"),
- text = True,
- overwrite = False)
+ text = True,
+ # Overwrite file every time.
+ # The stop.sh has the path to the socket, wich should change
+ # on every experiment run.
+ overwrite = True)
def upload_start_command(self):
- super(PlanetlabTap, self).upload_start_command()
+ # Overwrite file every time.
+ # The start.sh has the path to the socket, wich should change
+ # on every experiment run.
+ super(PlanetlabTap, self).upload_start_command(overwrite = True)
# We want to make sure the device is up and running
- # before the deploy finishes (so things will be ready
- # before other stuff starts running).
- # Run the command as a bash script in background,
- # in the host ( but wait until the command has
- # finished to continue )
+ # before the deploy finishes, so we execute now the
+ # start script. We run it in background, because the
+ # TAP will live for as long as the process that
+ # created it is running, and wait until the TAP
+ # is created.
self._run_in_background()
- # Retrive if_name
+ # After creating the TAP, the pl-vif-create.py script
+ # will write the name of the TAP to a file. We wait until
+ # we can read the interface name from the file.
if_name = self.wait_if_name()
self.set("deviceName", if_name)
- def deploy(self):
+ def do_deploy(self):
if not self.node or self.node.state < ResourceState.PROVISIONED:
self.ec.schedule(reschedule_delay, self.deploy)
else:
if not self.get("install"):
self.set("install", self._install)
- try:
- self.discover()
- self.provision()
- except:
- self.fail()
- raise
-
- self.debug("----- READY ---- ")
+ self.do_discover()
+ self.do_provision()
+
self.set_ready()
- def start(self):
+ def do_start(self):
if self.state == ResourceState.READY:
command = self.get("command")
self.info("Starting command '%s'" % command)
else:
msg = " Failed to execute command '%s'" % command
self.error(msg, out, err)
- self.fail()
raise RuntimeError, msg
- def stop(self):
+ def do_stop(self):
command = self.get('command') or ''
if self.state == ResourceState.STARTED:
if out.strip().find(self.get("deviceName")) == -1:
# tap is not running is not running (socket not found)
- self._finish_time = tnow()
- self._state = ResourceState.FINISHED
+ self.set_stopped()
self._last_state_check = tnow()
return self._state
- def release(self):
+ def do_release(self):
# Node needs to wait until all associated RMs are released
# to be released
from nepi.resources.linux.udptunnel import UdpTunnel
- rms = self.get_connected(UdpTunnel.rtype())
+ rms = self.get_connected(UdpTunnel.get_rtype())
for rm in rms:
if rm.state < ResourceState.STOPPED:
self.ec.schedule(reschedule_delay, self.release)
return
- super(PlanetlabTap, self).release()
+ super(PlanetlabTap, self).do_release()
def wait_if_name(self):
""" Waits until the if_name file for the command is generated,
and returns the if_name for the device """
if_name = None
- delay = 1.0
+ delay = 0.5
- for i in xrange(4):
+ for i in xrange(20):
(out, err), proc = self.node.check_output(self.run_home, "if_name")
+ if proc.poll() > 0:
+ (out, err), proc = self.node.check_errors(self.run_home)
+
+ if err.strip():
+ raise RuntimeError, err
+
if out:
if_name = out.strip()
break
else:
msg = "Couldn't retrieve if_name"
self.error(msg, out, err)
- self.fail()
raise RuntimeError, msg
return if_name
git://git.onelab.eu / nepi.git / blobdiff