commit 27b5e1bf84172d60aa7dd7f68b348984d561d062
author Ashlesh Gawande <agawande@memphis.edu> Mon Aug 06 17:47:15 2018 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Mon Dec 10 13:27:36 2018 -0600
tree 7bd81049984f036bf74f9a71f8e4997326a1d4be
parent 2b899536e983f60c6e128b77b1c517f8c5b3fcc9

Add startup experiments for NLSR and current testbed topology

refs: #4785

Change-Id: I957b8c229ed0696b2f3fca9445f9f27274b0e197

ndn/experiment_manager.py

diff --git a/ndn/experiment_manager.py b/ndn/experiment_manager.py
index 1275a96..0be9f92 100644
--- a/ndn/experiment_manager.py
+++ b/ndn/experiment_manager.py
@@ -38,7 +38,7 @@
 
     def loadModules(self):
         currentDir = os.path.dirname(__file__)
-        experimentDir = "%s/%s" % (currentDir, "experiments")
+        experimentDir = "{}/{}".format(currentDir, "experiments")
         experimentModule = "ndn.experiments"
 
         # Import and register experiments
@@ -46,13 +46,17 @@
             for filename in files:
                 if filename.endswith(".py") and filename != "__init__.py":
                     module = filename.replace(".py", "")
-                    __import__("%s.%s" % (experimentModule, module))
+                    subdir = os.path.basename(root)
+                    if subdir == "experiments":
+                        __import__("{}.{}".format(experimentModule, module))
+                    else:
+                        __import__("{}.{}.{}".format(experimentModule, subdir, module))
 
     def register(self, name, experimentClass):
         if name not in self.experiments:
             self.experiments[name] = experimentClass
         else:
-            raise _ExperimentManager.Error("Experiment '%s' has already been registered" % name)
+            raise _ExperimentManager.Error("Experiment '{}' has already been registered".format(name))
 
     def create(self, name, args):
         if name in self.experiments: