From 49e09dbdd2b07b1949812a048cc0a459b5b2171d Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Tue, 18 Feb 2014 00:14:42 +0100 Subject: [PATCH] Small bug-fixes to ns-3/nepi-3-dev merge --- src/nepi/resources/planetlab/openvswitch/tunnel.py | 2 +- src/nepi/resources/planetlab/vroute.py | 4 ++-- test/util/sshfuncs.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/nepi/resources/planetlab/openvswitch/tunnel.py b/src/nepi/resources/planetlab/openvswitch/tunnel.py index f076ec13..57a889a4 100644 --- a/src/nepi/resources/planetlab/openvswitch/tunnel.py +++ b/src/nepi/resources/planetlab/openvswitch/tunnel.py @@ -58,7 +58,7 @@ class OVSTunnel(LinuxApplication): """ network = Attribute("network", "IPv4 Network Address", - flags = Flags.ExecReadOnly) + flags = Flags.Design) cipher = Attribute("cipher", "Cipher to encript communication. " diff --git a/src/nepi/resources/planetlab/vroute.py b/src/nepi/resources/planetlab/vroute.py index 681e7559..70075610 100644 --- a/src/nepi/resources/planetlab/vroute.py +++ b/src/nepi/resources/planetlab/vroute.py @@ -40,10 +40,10 @@ class PlanetlabVroute(LinuxApplication): def _register_attributes(cls): action = Attribute("action", "Either add or del", allowed = ["add", "del"], - flags = Flags.ExecReadOnly) + flags = Flags.Design) network = Attribute("network", "IPv4 Network Address", - flags = Flags.ExecReadOnly) + flags = Flags.Design) cls._register_attribute(action) cls._register_attribute(network) diff --git a/test/util/sshfuncs.py b/test/util/sshfuncs.py index 75e54644..88f2eb25 100755 --- a/test/util/sshfuncs.py +++ b/test/util/sshfuncs.py @@ -215,7 +215,7 @@ class SSHfuncsTestCase(unittest.TestCase): os.remove(f1.name) shutil.rmtree(dirpath) - def test_rcopy_slist(self): + def test_rcopy_list(self): env = test_environment() user = getpass.getuser() host = "localhost" @@ -229,16 +229,17 @@ class SSHfuncsTestCase(unittest.TestCase): f1.close() f1.name - source = "%s;%s" % (dirpath, f1.name) + # Copy a list of files + source = [dirpath, f1.name] destdir = tempfile.mkdtemp() dest = "%s@%s:%s" % (user, host, destdir) - rcopy(source, dest, port = env.port, agent = True, recursive = True) + ((out, err), proc) = rcopy(source, dest, port = env.port, agent = True, recursive = True) files = [] def recls(files, dirname, names): files.extend(names) os.path.walk(destdir, recls, files) - + origfiles = map(lambda s: os.path.basename(s), [dirpath, f.name, f1.name]) self.assertEquals(sorted(origfiles), sorted(files)) -- 2.47.0