git://git.onelab.eu
/
nepi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02b8bd8
)
import files that are relative to the source as nepi.full.path
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 15 Oct 2015 17:39:45 +0000
(19:39 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 15 Oct 2015 17:40:38 +0000
(19:40 +0200)
src/nepi/resources/netns/netnsserver.py
patch
|
blob
|
history
src/nepi/resources/netns/netnswrapper.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3server.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3wrapper.py
patch
|
blob
|
history
diff --git
a/src/nepi/resources/netns/netnsserver.py
b/src/nepi/resources/netns/netnsserver.py
index
f2c37f2
..
0af5a27
100644
(file)
--- a/
src/nepi/resources/netns/netnsserver.py
+++ b/
src/nepi/resources/netns/netnsserver.py
@@
-26,7
+26,7
@@
import sys
from optparse import OptionParser, SUPPRESS_HELP
from optparse import OptionParser, SUPPRESS_HELP
-from netnswrapper import NetNSWrapper
+from ne
pi.resources.netns.ne
tnswrapper import NetNSWrapper
class NetNSWrapperMessage:
CREATE = "CREATE"
class NetNSWrapperMessage:
CREATE = "CREATE"
diff --git
a/src/nepi/resources/netns/netnswrapper.py
b/src/nepi/resources/netns/netnswrapper.py
index
f574ee0
..
9dff830
100644
(file)
--- a/
src/nepi/resources/netns/netnswrapper.py
+++ b/
src/nepi/resources/netns/netnswrapper.py
@@
-33,7
+33,7
@@
class NetNSWrapper(object):
self._logger.setLevel(loglevel)
# Object to dump instructions to reproduce and debug experiment
self._logger.setLevel(loglevel)
# Object to dump instructions to reproduce and debug experiment
- from netnswrapper_debug import NetNSWrapperDebuger
+ from ne
pi.resources.netns.ne
tnswrapper_debug import NetNSWrapperDebuger
self._debuger = NetNSWrapperDebuger(enabled = enable_dump)
@property
self._debuger = NetNSWrapperDebuger(enabled = enable_dump)
@property
diff --git
a/src/nepi/resources/ns3/ns3server.py
b/src/nepi/resources/ns3/ns3server.py
index
589e3d4
..
0149f50
100644
(file)
--- a/
src/nepi/resources/ns3/ns3server.py
+++ b/
src/nepi/resources/ns3/ns3server.py
@@
-26,7
+26,7
@@
import sys
from optparse import OptionParser, SUPPRESS_HELP
from optparse import OptionParser, SUPPRESS_HELP
-from ns3wrapper import NS3Wrapper
+from n
epi.resources.ns3.n
s3wrapper import NS3Wrapper
class NS3WrapperMessage:
CREATE = "CREATE"
class NS3WrapperMessage:
CREATE = "CREATE"
diff --git
a/src/nepi/resources/ns3/ns3wrapper.py
b/src/nepi/resources/ns3/ns3wrapper.py
index
9251006
..
a9a5e12
100644
(file)
--- a/
src/nepi/resources/ns3/ns3wrapper.py
+++ b/
src/nepi/resources/ns3/ns3wrapper.py
@@
-130,7
+130,7
@@
class NS3Wrapper(object):
self._allowed_types = None
# Object to dump instructions to reproduce and debug experiment
self._allowed_types = None
# Object to dump instructions to reproduce and debug experiment
- from ns3wrapper_debug import NS3WrapperDebuger
+ from n
epi.resources.ns3.n
s3wrapper_debug import NS3WrapperDebuger
self._debuger = NS3WrapperDebuger(enabled = enable_dump)
@property
self._debuger = NS3WrapperDebuger(enabled = enable_dump)
@property