Cleaning up directory structure for resources

diff --git a/setup.py b/setup.py
index a8cf029..0c99f82 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,9 +15,11 @@ setup(
             "neco.design",
             "neco.execution",
             "neco.resources",
-            "neco.resources.base",
+            "neco.resources.linux",
             "neco.resources.netns",
             "neco.resources.ns3",
+            "neco.resources.omf",
+            "neco.resources.planetlab",
             "neco.tags",
             "neco.util"],
         package_dir = {"": "src"},

diff --git a/src/neco/resources/base/__init__.py b/src/neco/resources/linux/__init__.py
similarity index 100%
rename from src/neco/resources/base/__init__.py
rename to src/neco/resources/linux/__init__.py

diff --git a/src/neco/resources/base/application.py b/src/neco/resources/linux/application.py
similarity index 100%
rename from src/neco/resources/base/application.py
rename to src/neco/resources/linux/application.py

diff --git a/src/neco/resources/base/linux_node.py b/src/neco/resources/linux/node.py
similarity index 100%
rename from src/neco/resources/base/linux_node.py
rename to src/neco/resources/linux/node.py

diff --git a/src/neco/resources/omf/__init__.py b/src/neco/resources/omf/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/neco/resources/planetlab/__init__.py b/src/neco/resources/planetlab/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/neco/util/environ.py b/src/neco/util/environ.py
new file mode 100644 (file)
index 0000000..599140a
--- /dev/null
+++ b/src/neco/util/environ.py
@@ -0,0 +1,181 @@
+import ctypes
+import imp
+import sys
+
+import os, os.path, re, signal, shutil, socket, subprocess, tempfile
+
+__all__ =  ["python", "ssh_path"]
+__all__ += ["rsh", "tcpdump_path", "sshd_path"]
+__all__ += ["execute", "backticks"]
+
+
+# Unittest from Python 2.6 doesn't have these decorators
+def _bannerwrap(f, text):
+    name = f.__name__
+    def banner(*args, **kwargs):
+        sys.stderr.write("*** WARNING: Skipping test %s: `%s'\n" %
+                (name, text))
+        return None
+    return banner
+
+def skip(text):
+    return lambda f: _bannerwrap(f, text)
+
+def skipUnless(cond, text):
+    return (lambda f: _bannerwrap(f, text)) if not cond else lambda f: f
+
+def skipIf(cond, text):
+    return (lambda f: _bannerwrap(f, text)) if cond else lambda f: f
+
+def find_bin(name, extra_path = None):
+    search = []
+    if "PATH" in os.environ:
+        search += os.environ["PATH"].split(":")
+    for pref in ("/", "/usr/", "/usr/local/"):
+        for d in ("bin", "sbin"):
+            search.append(pref + d)
+    if extra_path:
+        search += extra_path
+
+    for d in search:
+            try:
+                os.stat(d + "/" + name)
+                return d + "/" + name
+            except OSError, e:
+                if e.errno != os.errno.ENOENT:
+                    raise
+    return None
+
+def find_bin_or_die(name, extra_path = None):
+    r = find_bin(name)
+    if not r:
+        raise RuntimeError(("Cannot find `%s' command, impossible to " +
+                "continue.") % name)
+    return r
+
+def find_bin(name, extra_path = None):
+    search = []
+    if "PATH" in os.environ:
+        search += os.environ["PATH"].split(":")
+    for pref in ("/", "/usr/", "/usr/local/"):
+        for d in ("bin", "sbin"):
+            search.append(pref + d)
+    if extra_path:
+        search += extra_path
+
+    for d in search:
+            try:
+                os.stat(d + "/" + name)
+                return d + "/" + name
+            except OSError, e:
+                if e.errno != os.errno.ENOENT:
+                    raise
+    return None
+
+ssh_path = find_bin_or_die("ssh")
+python_path = find_bin_or_die("python")
+
+# Optional tools
+rsh_path = find_bin("rsh")
+tcpdump_path = find_bin("tcpdump")
+sshd_path = find_bin("sshd")
+
+def execute(cmd):
+    # FIXME: create a global debug variable
+    #print "[pid %d]" % os.getpid(), " ".join(cmd)
+    null = open("/dev/null", "r+")
+    p = subprocess.Popen(cmd, stdout = null, stderr = subprocess.PIPE)
+    out, err = p.communicate()
+    if p.returncode != 0:
+        raise RuntimeError("Error executing `%s': %s" % (" ".join(cmd), err))
+
+def backticks(cmd):
+    p = subprocess.Popen(cmd, stdout = subprocess.PIPE,
+            stderr = subprocess.PIPE)
+    out, err = p.communicate()
+    if p.returncode != 0:
+        raise RuntimeError("Error executing `%s': %s" % (" ".join(cmd), err))
+    return out
+
+
+# SSH stuff
+
+def gen_ssh_keypair(filename):
+    ssh_keygen = nepi.util.environ.find_bin_or_die("ssh-keygen")
+    args = [ssh_keygen, '-q', '-N', '', '-f', filename]
+    assert subprocess.Popen(args).wait() == 0
+    return filename, "%s.pub" % filename
+
+def add_key_to_agent(filename):
+    ssh_add = nepi.util.environ.find_bin_or_die("ssh-add")
+    args = [ssh_add, filename]
+    null = file("/dev/null", "w")
+    assert subprocess.Popen(args, stderr = null).wait() == 0
+    null.close()
+
+def get_free_port():
+    s = socket.socket()
+    s.bind(("127.0.0.1", 0))
+    port = s.getsockname()[1]
+    return port
+
+_SSH_CONF = """ListenAddress 127.0.0.1:%d
+Protocol 2
+HostKey %s
+UsePrivilegeSeparation no
+PubkeyAuthentication yes
+PasswordAuthentication no
+AuthorizedKeysFile %s
+UsePAM no
+AllowAgentForwarding yes
+PermitRootLogin yes
+StrictModes no
+PermitUserEnvironment yes
+"""
+
+def gen_sshd_config(filename, port, server_key, auth_keys):
+    conf = open(filename, "w")
+    text = _SSH_CONF % (port, server_key, auth_keys)
+    conf.write(text)
+    conf.close()
+    return filename
+
+def gen_auth_keys(pubkey, output, environ):
+    #opts = ['from="127.0.0.1/32"'] # fails in stupid yans setup
+    opts = []
+    for k, v in environ.items():
+        opts.append('environment="%s=%s"' % (k, v))
+
+    lines = file(pubkey).readlines()
+    pubkey = lines[0].split()[0:2]
+    out = file(output, "w")
+    out.write("%s %s %s\n" % (",".join(opts), pubkey[0], pubkey[1]))
+    out.close()
+    return output
+
+def start_ssh_agent():
+    ssh_agent = nepi.util.environ.find_bin_or_die("ssh-agent")
+    proc = subprocess.Popen([ssh_agent], stdout = subprocess.PIPE)
+    (out, foo) = proc.communicate()
+    assert proc.returncode == 0
+    d = {}
+    for l in out.split("\n"):
+        match = re.search("^(\w+)=([^ ;]+);.*", l)
+        if not match:
+            continue
+        k, v = match.groups()
+        os.environ[k] = v
+        d[k] = v
+    return d
+
+def stop_ssh_agent(data):
+    # No need to gather the pid, ssh-agent knows how to kill itself; after we
+    # had set up the environment
+    ssh_agent = nepi.util.environ.find_bin_or_die("ssh-agent")
+    null = file("/dev/null", "w")
+    proc = subprocess.Popen([ssh_agent, "-k"], stdout = null)
+    null.close()
+    assert proc.wait() == 0
+    for k in data:
+        del os.environ[k]
+

diff --git a/test/resources/base/linux_node.py b/test/resources/linux/node.py
old mode 100644 (file)
new mode 100755 (executable)
similarity index 98%
rename from test/resources/base/linux_node.py
rename to test/resources/linux/node.py
index 55c0eb1..acb86d6
--- a/test/resources/base/linux_node.py
+++ b/test/resources/linux/node.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from neco.resources.base.linux_node import LinuxNode
+from neco.resources.linux.node import LinuxNode
 from neco.design.box import Box
 from neco.util.sshfuncs import RUNNING, FINISHED