git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing ResourceManager naming for platform::ResourceName
[nepi.git]
/
test
/
resources
/
planetlab
/
tap.py
diff --git
a/test/resources/planetlab/tap.py
b/test/resources/planetlab/tap.py
index
f08a54c
..
5b63fab
100755
(executable)
--- a/
test/resources/planetlab/tap.py
+++ b/
test/resources/planetlab/tap.py
@@
-20,7
+20,7
@@
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
-from test_utils import skipIfNotAlive
, skipInteractive
+from test_utils import skipIfNotAlive
import os
import time
import os
import time
@@
-28,27
+28,34
@@
import unittest
class PlanetlabTapTestCase(unittest.TestCase):
def setUp(self):
class PlanetlabTapTestCase(unittest.TestCase):
def setUp(self):
- self.host = "
nepi2.pl.sophia.inria.fr
"
+ self.host = "
planetlab1.informatik.uni-erlangen.de
"
self.user = "inria_nepi"
self.user = "inria_nepi"
+ self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+ self.netblock = "192.168.3"
+ #self.host = "nepi2.pl.sophia.inria.fr"
+ #self.user = "inria_nepi"
+ #self.identity = None
+ #self.netblock = "192.168.1"
@skipIfNotAlive
@skipIfNotAlive
- def t_tap_create(self, host, user):
+ def t_tap_create(self, host, user
, identity
):
ec = ExperimentController(exp_id = "test-tap-create")
ec = ExperimentController(exp_id = "test-tap-create")
- node = ec.register_resource("
Planetlab
Node")
+ node = ec.register_resource("
planetlab::
Node")
ec.set(node, "hostname", host)
ec.set(node, "username", user)
ec.set(node, "hostname", host)
ec.set(node, "username", user)
- ec.set(node, "cleanHome", True)
+ ec.set(node, "identity", identity)
+ ec.set(node, "cleanExperiment", True)
ec.set(node, "cleanProcesses", True)
ec.set(node, "cleanProcesses", True)
- tap = ec.register_resource("
Planetlab
Tap")
- ec.set(tap, "
ip4", "192.168.1.1"
)
- ec.set(tap, "
prefix4
", 24)
+ tap = ec.register_resource("
planetlab::
Tap")
+ ec.set(tap, "
endpoint_ip", "%s.1" % self.netblock
)
+ ec.set(tap, "
endpoint_prefix
", 24)
ec.register_connection(tap, node)
ec.register_connection(tap, node)
- app = ec.register_resource("
Linux
Application")
- cmd = "ping -c3
192.168.1.1"
+ app = ec.register_resource("
linux::
Application")
+ cmd = "ping -c3
%s.1" % self.netblock
ec.set(app, "command", cmd)
ec.register_connection(app, node)
ec.set(app, "command", cmd)
ec.register_connection(app, node)
@@
-66,7
+73,7
@@
class PlanetlabTapTestCase(unittest.TestCase):
ec.shutdown()
def test_tap_create(self):
ec.shutdown()
def test_tap_create(self):
- self.t_tap_create(self.host, self.user)
+ self.t_tap_create(self.host, self.user
, self.identity
)
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()