X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fplanetlab%2Ftap.py;h=5a47663cf2b7c13b109dce252af82ffa339ec71f;hb=38575a0f27f26511965771dde8320060b10252dd;hp=6947080525a514697cd8fe336b39096989202a27;hpb=47bfadde39e0d22c3df7e2bd1cd4d52f07ad8c0a;p=nepi.git diff --git a/src/nepi/resources/planetlab/tap.py b/src/nepi/resources/planetlab/tap.py index 69470805..5a47663c 100644 --- a/src/nepi/resources/planetlab/tap.py +++ b/src/nepi/resources/planetlab/tap.py @@ -25,13 +25,8 @@ from nepi.resources.planetlab.node import PlanetlabNode from nepi.util.timefuncs import tnow, tdiffsec import os -import socket import time -# TODO: -# - CREATE GRE - PlanetlabGRE - it only needs to set the gre and remote -# properties when configuring the vif_up - PYTHON_VSYS_VERSION = "1.0" @clsinit_copy @@ -42,13 +37,15 @@ class PlanetlabTap(LinuxApplication): @classmethod def _register_attributes(cls): - ip4 = Attribute("ip4", "IPv4 Address", + endpoint_ip = Attribute("endpoint_ip", "IP of the endpoint. This is the attribute " + "you should use to establish a tunnel or a remote " + "connection between endpoint", flags = Flags.Design) mac = Attribute("mac", "MAC Address", flags = Flags.Design) - prefix4 = Attribute("prefix4", "IPv4 network prefix", + endpoint_prefix = Attribute("endpoint_prefix", "IPv4 network prefix of the endpoint", type = Types.Integer, flags = Flags.Design) @@ -88,9 +85,9 @@ class PlanetlabTap(LinuxApplication): "Bash script to be executed before releasing the resource", flags = Flags.Design) - cls._register_attribute(ip4) + cls._register_attribute(endpoint_ip) cls._register_attribute(mac) - cls._register_attribute(prefix4) + cls._register_attribute(endpoint_prefix) cls._register_attribute(mtu) cls._register_attribute(devname) cls._register_attribute(up) @@ -110,7 +107,7 @@ class PlanetlabTap(LinuxApplication): def node(self): node = self.get_connected(PlanetlabNode.get_rtype()) if node: return node[0] - return None + raise RuntimeError, "TAP/TUN devices must be connected to Node" @property def gre_enabled(self): @@ -164,9 +161,8 @@ class PlanetlabTap(LinuxApplication): # upload stop.sh script stop_command = self.replace_paths(self._stop_command) - self.node.upload(stop_command, - os.path.join(self.app_home, "stop.sh"), - text = True, + self.node.upload_command(stop_command, + shfile = os.path.join(self.app_home, "stop.sh"), # Overwrite file every time. # The stop.sh has the path to the socket, which should change # on every experiment run. @@ -270,17 +266,23 @@ class PlanetlabTap(LinuxApplication): super(PlanetlabTap, self).do_release() - def wait_vif_name(self): + def wait_vif_name(self, exec_run_home = None): """ Waits until the vif_name file for the command is generated, and returns the vif_name for the device """ vif_name = None delay = 0.5 + # The vif_name file will be created in the tap-home, while the + # current execution home might be elsewhere to check for errors + # (e.g. could be a tunnel-home) + if not exec_run_home: + exec_run_home = self.run_home + for i in xrange(20): (out, err), proc = self.node.check_output(self.run_home, "vif_name") if proc.poll() > 0: - (out, err), proc = self.node.check_errors(self.run_home) + (out, err), proc = self.node.check_errors(exec_run_home) if err.strip(): raise RuntimeError, err @@ -298,14 +300,94 @@ class PlanetlabTap(LinuxApplication): return vif_name - def udp_connect_command(self, remote_endpoint, connection_run_home, + def gre_connect(self, remote_endpoint, connection_app_home, + connection_run_home): + gre_connect_command = self._gre_connect_command( + remote_endpoint, connection_run_home) + + # upload command to connect.sh script + shfile = os.path.join(connection_app_home, "gre-connect.sh") + self.node.upload_command(gre_connect_command, + shfile = shfile, + overwrite = False) + + # invoke connect script + cmd = "bash %s" % shfile + (out, err), proc = self.node.run(cmd, connection_run_home) + + # check if execution errors occurred + msg = " Failed to connect endpoints " + + if proc.poll() or err: + self.error(msg, out, err) + raise RuntimeError, msg + + # Wait for pid file to be generated + pid, ppid = self.node.wait_pid(connection_run_home) + + # If the process is not running, check for error information + # on the remote machine + if not pid or not ppid: + (out, err), proc = self.node.check_errors(connection_run_home) + # Out is what was written in the stderr file + if err: + msg = " Failed to start command '%s' " % command + self.error(msg, out, err) + raise RuntimeError, msg + + # 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. + vif_name = self.wait_vif_name(exec_run_home = connection_run_home) + self.set("deviceName", vif_name) + + return True + + def udp_connect(self, remote_endpoint, connection_app_home, + connection_run_home, cipher, cipher_key, bwlimit, txqueuelen): + udp_connect_command = self._udp_connect_command( + remote_endpoint, connection_run_home, + cipher, cipher_key, bwlimit, txqueuelen) + + # upload command to connect.sh script + shfile = os.path.join(connection_app_home, "udp-connect.sh") + self.node.upload_command(udp_connect_command, + shfile = shfile, + overwrite = False) + + # invoke connect script + cmd = "bash %s" % shfile + (out, err), proc = self.node.run(cmd, connection_run_home) + + # check if execution errors occurred + msg = "Failed to connect endpoints " + + if proc.poll(): + self.error(msg, out, err) + raise RuntimeError, msg + + # Wait for pid file to be generated + pid, ppid = self.node.wait_pid(connection_run_home) + + # If the process is not running, check for error information + # on the remote machine + if not pid or not ppid: + (out, err), proc = self.node.check_errors(connection_run_home) + # Out is what was written in the stderr file + if err: + msg = " Failed to start command '%s' " % command + self.error(msg, out, err) + raise RuntimeError, msg + + return pid, ppid + + def _udp_connect_command(self, remote_endpoint, connection_run_home, cipher, cipher_key, bwlimit, txqueuelen): # Set the remote endpoint - self.set("pointopoint", remote_endpoint.get("ip4")) + self.set("pointopoint", remote_endpoint.get("endpoint_ip")) - remote_ip = socket.gethostbyname( - remote_endpoint.node.get("hostname")) + remote_ip = remote_endpoint.node.get("ip") local_port_file = os.path.join(connection_run_home, "local_port") @@ -350,16 +432,15 @@ class PlanetlabTap(LinuxApplication): return command - def gre_connect_command(self, remote_endpoint, connection_run_home): + def _gre_connect_command(self, remote_endpoint, connection_run_home): # Set the remote endpoint - self.set("pointopoint", remote_endpoint.get("ip4")) - self.set("gre_remote", socket.gethostbyname( - remote_endpoint.node.get("hostname"))) + self.set("pointopoint", remote_endpoint.get("endpoint_ip")) + self.set("greRemote", remote_endpoint.node.get("ip")) # Generate GRE connect command # Use vif_down command to first kill existing TAP in GRE mode - vif_down_command = self._vif_command_command + vif_down_command = self._vif_down_command # Use pl-vif-up.py script to configure TAP with peer info vif_up_command = self._vif_up_command @@ -383,8 +464,8 @@ class PlanetlabTap(LinuxApplication): command = ["sudo -S python ${SRC}/pl-vif-create.py"] command.append("-t %s" % self.vif_type) - command.append("-a %s" % self.get("ip4")) - command.append("-n %d" % self.get("prefix4")) + command.append("-a %s" % self.get("endpoint_ip")) + command.append("-n %d" % self.get("endpoint_prefix")) command.append("-f %s " % self.vif_name_file) command.append("-S %s " % self.sock_name) @@ -402,7 +483,7 @@ class PlanetlabTap(LinuxApplication): @property def _stop_command(self): if self.gre_enabled: - command = self._vif_down_command() + command = self._vif_down_command else: command = ["sudo -S "] command.append("PYTHONPATH=$PYTHONPATH:${SRC}") @@ -423,10 +504,11 @@ class PlanetlabTap(LinuxApplication): command = ["sudo -S "] command.append("PYTHONPATH=$PYTHONPATH:${SRC}") command.append("python ${SRC}/pl-vif-up.py") - command.append("-N %s" % self.get("deviceName")) + command.append("-u %s" % self.node.get("username")) + command.append("-N %s" % device_name) command.append("-t %s" % self.vif_type) - command.append("-a %s" % self.get("ip4")) - command.append("-n %d" % self.get("prefix4")) + command.append("-a %s" % self.get("endpoint_ip")) + command.append("-n %d" % self.get("endpoint_prefix")) if self.get("snat") == True: command.append("-s") @@ -438,8 +520,8 @@ class PlanetlabTap(LinuxApplication): command.append("-q %s" % self.get("txqueuelen")) if self.gre_enabled: - command.append("-g %s" % self.gre("greKey")) - command.append("-G %s" % self.gre("greRemote")) + command.append("-g %s" % self.get("greKey")) + command.append("-G %s" % self.get("greRemote")) command.append("-f %s " % self.vif_name_file) @@ -447,11 +529,20 @@ class PlanetlabTap(LinuxApplication): @property def _vif_down_command(self): + if self.gre_enabled: + device_name = "%s" % self.guid + else: + device_name = self.get("deviceName") + command = ["sudo -S "] command.append("PYTHONPATH=$PYTHONPATH:${SRC}") command.append("python ${SRC}/pl-vif-down.py") - command.append("-D") - command.append("-N %s " % self.get("deviceName")) + command.append("-N %s " % device_name) + + if self.gre_enabled: + command.append("-u %s" % self.node.get("username")) + command.append("-t %s" % self.vif_type) + command.append("-D") return " ".join(command)