Merge pull request #24 from YousefEZ/cmdline

Cmdline

Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get install -y ccache gdb valgrind
 
 # python dependencies
 RUN apt install -y python3-dev pkg-config python3-setuptools
-RUN python3 -m pip install cppyy==2.4.2
+# RUN python3 -m pip install cppyy==2.4.2
 
 # Download the tar file
 ADD https://www.nsnam.org/release/ns-allinone-3.41.tar.bz2 /usr/workspace

docker-compose.yml

@@ -6,3 +6,4 @@ services:
       - ./src:/usr/workspace/ns-allinone-3.41/ns-3.41/user_src
       - ./libs:/usr/workspace/ns-allinone-3.41/ns-3.41/libs
       - ./traces:/usr/workspace/ns-allinone-3.41/ns-3.41/traces
+      - ./run_ns3.sh:/usr/workspace/ns-allinone-3.41/ns-3.41/run_ns3.sh # Mounting run_ns3.sh

entrypoint.sh

@@ -6,20 +6,23 @@ mkdir traces
 cp user_src/* scratch/
 export NS_LOG=FRRQueue=level_all
 
+cp ./run_ns3.sh ./.
+
 ./ns3 build
 
 if [ $? -ne 0 ]; then
-  echo "ns3 build failed"
-  exit 1
+	echo "ns3 build failed"
+	exit 1
 fi
 
 if [ -z "$1" ]; then
-  exit 0
+	exit 0
 fi
 
-./ns3 run "scratch/$1"
+# ./ns3 run 'scratch/combined-frr.cc --delay_bottleneck=1ms'
+./run_ns3.sh
 if [ $? -ne 0 ]; then
-  echo "./ns3 run for $name failed"
-  exit 1
+	echo "./ns3 run for $name failed"
+	exit 1
 fi
 exit 0