change default working directory
refs: #4357
Change-Id: I76715ddb4408a7c8c556ea5c5dbdf573f6eb840e
diff --git a/INSTALL.md b/INSTALL.md
index b55e8f8..1792aa2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -62,5 +62,5 @@
1. Issue the command: `sudo minindn --experiment=pingall --nPings=50`
2. When the `mini-ndn>` CLI prompt appears, the experiment has finished. On the Mini-NDN CLI, issue the command `exit` to exit the experiment.
-3. Issue the command: `grep -c content /tmp/*/ping-data/*.txt`. Each file should report a count of 50.
-4. Issue the command: `grep -c timeout /tmp/*/ping-data/*.txt`. Each file should report a count of 0.
+3. Issue the command: `grep -c content /tmp/minindn/*/ping-data/*.txt`. Each file should report a count of 50.
+4. Issue the command: `grep -c timeout /tmp/minindn/*/ping-data/*.txt`. Each file should report a count of 0.
diff --git a/bin/minindn b/bin/minindn
index 4a1feb0..99aa05c 100755
--- a/bin/minindn
+++ b/bin/minindn
@@ -120,7 +120,7 @@
self.nlsrSecurity = False
self.nPings = 300
self.testbed = False
- self.workDir = "/tmp"
+ self.workDir = "/tmp/minindn"
self.resultDir = None
self.pctTraffic = 1.0
self.cluster = None
@@ -188,8 +188,8 @@
parser.add_argument("-t", "--testbed", action="store_true", dest="testbed",
help="Instantiates a snapshot of the NDN Testbed irrespective of the tempfile provided")
- parser.add_argument("--work-dir", action="store", dest="workDir", default="/tmp",
- help="Specify the working directory; default is /tmp")
+ parser.add_argument("--work-dir", action="store", dest="workDir", default="/tmp/minindn",
+ help="Specify the working directory; default is /tmp/minindn")
parser.add_argument("--result-dir", action="store", dest="resultDir", default=None,
help="Specify the full path destination folder where experiment results will be moved")
diff --git a/docs/EXPERIMENTS.md b/docs/EXPERIMENTS.md
index 547c2e8..b72ba7c 100644
--- a/docs/EXPERIMENTS.md
+++ b/docs/EXPERIMENTS.md
@@ -105,9 +105,9 @@
### Experiment data
-The ping data is stored at `/tmp/node-name/ping-data`.
+The ping data is stored at `/tmp/minindn/node-name/ping-data`.
-The ping server log is stored at `/tmp/node-name/ping-server`
+The ping server log is stored at `/tmp/minindn/node-name/ping-server`
## Creating custom experiments
@@ -175,7 +175,7 @@
def run(self):
for host in self.net.hosts:
# By default status.txt would be stored
- # at /tmp/host/status.txt
+ # at /tmp/minindn/host/status.txt
host.cmd("nfdc status report > status.txt")
Experiment.register("example-name", ExampleExperiment)
diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md
index b4c1f18..12912e4 100644
--- a/docs/GETTING-STARTED.md
+++ b/docs/GETTING-STARTED.md
@@ -57,7 +57,7 @@
sudo minindn --testbed
-To change the working directory from default `/tmp` following option can be used:
+To change the working directory from default `/tmp/minindn` following option can be used:
sudo minindn --work-dir /home/mydir/test
@@ -91,22 +91,23 @@
## Working Directory Structure
-Currently Mini-NDN uses /tmp as the working directory if not specified otherwise by using the option --work-dir.
+Currently Mini-NDN uses /tmp/minindn as the working directory if not specified otherwise by using
+the option --work-dir.
-Each node is given a HOME directory under /tmp/node-name
+Each node is given a HOME directory under /tmp/minindn/node-name
where node-name is the name of the node specified in the [nodes] section of the conf file.
### NFD
-NFD conf file is stored at `/tmp/node-name/node-name.conf`
+NFD conf file is stored at `/tmp/minindn/node-name/node-name.conf`
-NFD log file is stored at `/tmp/node-name/node-name.log`
+NFD log file is stored at `/tmp/minindn/node-name/node-name.log`
-`.ndn` folder is stored at `/tmp/node-name/.ndn`
+`.ndn` folder is stored at `/tmp/minindn/node-name/.ndn`
### NLSR
-NLSR conf file is stored at `/tmp/node-name/nlsr.conf`
+NLSR conf file is stored at `/tmp/minindn/node-name/nlsr.conf`
-NLSR log file is stored at `/tmp/node-name/log/nlsr.log`
+NLSR log file is stored at `/tmp/minindn/node-name/log/nlsr.log`
-When security is enabled, NLSR security certificates are stored in: `/tmp/node-name/security`
+When security is enabled, NLSR security certificates are stored in: `/tmp/minindn/node-name/security`
Note that no NLSR publishes the root certificate, Mini-NDN installs root.cert in security folder for each NLSR.